Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48ae0b35 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/bus: make external class definitions pointers 



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

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

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv04_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -69,7 +69,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv05_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;

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

+8 −8
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -70,7 +70,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -89,7 +89,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -108,7 +108,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -127,7 +127,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -146,7 +146,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -165,7 +165,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -184,7 +184,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;

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

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -73,7 +73,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -92,7 +92,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -111,7 +111,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;

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

+5 −5
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -73,7 +73,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv04_bus_oclass;

		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;
@@ -92,7 +92,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -112,7 +112,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -132,7 +132,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;

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

+16 −16
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -78,7 +78,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -99,7 +99,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -120,7 +120,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -141,7 +141,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -162,7 +162,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -183,7 +183,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -204,7 +204,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -225,7 +225,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -246,7 +246,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -267,7 +267,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -288,7 +288,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -309,7 +309,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -330,7 +330,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -351,7 +351,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;
@@ -372,7 +372,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv31_bus_oclass;

		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;