Commit 08f6fbdb authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mc: store static data in nouveau_mc class definition 



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

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

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

		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_MC     ] =  nv04_mc_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;
@@ -68,7 +68,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;

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

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

		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_MC     ] =  nv04_mc_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;
@@ -69,7 +69,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -88,7 +88,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -107,7 +107,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -126,7 +126,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -145,7 +145,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -164,7 +164,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -183,7 +183,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;

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

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

		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_MC     ] =  nv04_mc_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;
@@ -72,7 +72,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -91,7 +91,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -110,7 +110,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;

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

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

		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_MC     ] =  nv04_mc_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;
@@ -72,7 +72,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -91,7 +91,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -111,7 +111,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;
@@ -131,7 +131,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		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_MC     ] =  nv04_mc_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;

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

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

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_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;
@@ -77,7 +77,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_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;
@@ -98,7 +98,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_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;
@@ -119,7 +119,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_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;
@@ -140,7 +140,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_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;
@@ -161,7 +161,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_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;
@@ -182,7 +182,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_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;
@@ -203,7 +203,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_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;
@@ -224,7 +224,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		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_MC     ] =  nv44_mc_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;
@@ -245,7 +245,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		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_MC     ] =  nv44_mc_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;
@@ -266,7 +266,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		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_MC     ] =  nv44_mc_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;
@@ -287,7 +287,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		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_MC     ] =  nv44_mc_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;
@@ -308,7 +308,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		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_MC     ] =  nv44_mc_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;
@@ -329,7 +329,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		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_MC     ] =  nv44_mc_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;
@@ -350,7 +350,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		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_MC     ] =  nv44_mc_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;
@@ -371,7 +371,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		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_MC     ] =  nv44_mc_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;