Commit 24a4ae86 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/instmem: tidy up the subdev class definition 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 64c672ae

drivers/gpu/drm/nouveau/core/engine/device/nv04.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv04_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv04_fifo_oclass;
@@ -72,7 +72,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv04_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv04_fifo_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nv10.c

+8 −8
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;
@@ -73,7 +73,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;
@@ -92,7 +92,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;
@@ -111,7 +111,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv1a_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;
@@ -130,7 +130,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;
@@ -149,7 +149,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
@@ -168,7 +168,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv1a_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
@@ -187,7 +187,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nv20.c

+4 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv20_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
@@ -76,7 +76,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv25_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
@@ -95,7 +95,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv25_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
@@ -114,7 +114,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv25_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nv30.c

+5 −5
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv30_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
@@ -76,7 +76,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv35_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
@@ -95,7 +95,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv30_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
@@ -115,7 +115,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv36_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
@@ -135,7 +135,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nv40.c

+16 −16
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv40_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -85,7 +85,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv41_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv41_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -108,7 +108,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv41_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv41_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -131,7 +131,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv41_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv41_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -154,7 +154,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv40_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -177,7 +177,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv47_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv41_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -200,7 +200,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv49_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv41_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -223,7 +223,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv49_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv41_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -246,7 +246,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv44_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv44_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -269,7 +269,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv44_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -292,7 +292,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv44_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv44_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -315,7 +315,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv44_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -338,7 +338,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv4e_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv44_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -361,7 +361,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv44_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -384,7 +384,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv44_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
@@ -407,7 +407,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv40_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv44_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;