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

Commit ff4b42c7 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/pwr: initial implementation 



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

drivers/gpu/drm/nouveau/Makefile

+6 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,12 @@ nouveau-y += core/subdev/mc/nvc3.o 
nouveau-y += core/subdev/mxm/base.o

nouveau-y += core/subdev/mxm/base.o

nouveau-y += core/subdev/mxm/mxms.o

nouveau-y += core/subdev/mxm/mxms.o

nouveau-y += core/subdev/mxm/nv50.o

nouveau-y += core/subdev/mxm/nv50.o

nouveau-y += core/subdev/pwr/base.o

nouveau-y += core/subdev/pwr/memx.o

nouveau-y += core/subdev/pwr/nva3.o

nouveau-y += core/subdev/pwr/nvc0.o

nouveau-y += core/subdev/pwr/nvd0.o

nouveau-y += core/subdev/pwr/nv108.o

nouveau-y += core/subdev/therm/base.o

nouveau-y += core/subdev/therm/base.o

nouveau-y += core/subdev/therm/fan.o

nouveau-y += core/subdev/therm/fan.o

nouveau-y += core/subdev/therm/fannil.o

nouveau-y += core/subdev/therm/fannil.o

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -75,6 +75,7 @@ static const u64 disable_map[] = { 
	[NVDEV_SUBDEV_BAR]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_BAR]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_VOLT]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_VOLT]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_THERM]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_THERM]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_PWR]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_ENGINE_DMAOBJ]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_ENGINE_DMAOBJ]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_ENGINE_FIFO]	= NV_DEVICE_DISABLE_FIFO,

	[NVDEV_ENGINE_FIFO]	= NV_DEVICE_DISABLE_FIFO,

	[NVDEV_ENGINE_SW]	= NV_DEVICE_DISABLE_FIFO,

	[NVDEV_ENGINE_SW]	= NV_DEVICE_DISABLE_FIFO,

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <subdev/instmem.h>

#include <subdev/instmem.h>

#include <subdev/vm.h>

#include <subdev/vm.h>

#include <subdev/bar.h>

#include <subdev/bar.h>

#include <subdev/pwr.h>





#include <engine/device.h>

#include <engine/device.h>

#include <engine/dmaobj.h>

#include <engine/dmaobj.h>
@@ -327,6 +328,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nva3_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;
@@ -354,6 +356,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nva3_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;
@@ -380,6 +383,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nva3_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;
@@ -406,6 +410,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nva3_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <subdev/instmem.h>

#include <subdev/instmem.h>

#include <subdev/vm.h>

#include <subdev/vm.h>

#include <subdev/bar.h>

#include <subdev/bar.h>

#include <subdev/pwr.h>





#include <engine/device.h>

#include <engine/device.h>

#include <engine/dmaobj.h>

#include <engine/dmaobj.h>
@@ -72,6 +73,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -101,6 +103,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -130,6 +133,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -158,6 +162,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -187,6 +192,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -216,6 +222,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -244,6 +251,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -273,6 +281,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <subdev/instmem.h>

#include <subdev/instmem.h>

#include <subdev/vm.h>

#include <subdev/vm.h>

#include <subdev/bar.h>

#include <subdev/bar.h>

#include <subdev/pwr.h>





#include <engine/device.h>

#include <engine/device.h>

#include <engine/dmaobj.h>

#include <engine/dmaobj.h>
@@ -72,6 +73,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -102,6 +104,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -132,6 +135,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -162,6 +166,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -194,6 +199,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nv108_pwr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

#if 0

#if 0

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;