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

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

drm/nouveau/volt: implement voltage control in core 



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

drivers/gpu/drm/nouveau/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -162,6 +162,9 @@ nouveau-y += core/subdev/vm/nv41.o 
nouveau-y += core/subdev/vm/nv44.o

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

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

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

nouveau-y += core/subdev/volt/gpio.o

nouveau-y += core/subdev/volt/nv40.o



nouveau-y += core/engine/falcon.o

nouveau-y += core/engine/xtensa.o

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

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

#include <subdev/instmem.h>

#include <subdev/vm.h>

#include <subdev/volt.h>



#include <engine/device.h>

#include <engine/dmaobj.h>
@@ -63,6 +64,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv40_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -85,6 +87,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv41_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -107,6 +110,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv41_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -129,6 +133,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv41_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -151,6 +156,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv40_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -173,6 +179,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv47_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -195,6 +202,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv49_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -217,6 +225,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv49_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -239,6 +248,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv44_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -261,6 +271,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -283,6 +294,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv44_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -305,6 +317,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -327,6 +340,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv4e_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -349,6 +363,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -371,6 +386,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
@@ -393,6 +409,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_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;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv40_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

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

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

#include <subdev/bar.h>

#include <subdev/pwr.h>

#include <subdev/volt.h>



#include <engine/device.h>

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

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv50_fifo_oclass;

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

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

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

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

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

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

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

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

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

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

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

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

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

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

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

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

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

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;
@@ -340,6 +351,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nva3_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;
@@ -369,6 +381,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nva3_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;
@@ -397,6 +410,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nva3_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;
@@ -425,6 +439,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nv50_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nva3_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv50_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_software_oclass;

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

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

#include <subdev/bar.h>

#include <subdev/pwr.h>

#include <subdev/volt.h>



#include <engine/device.h>

#include <engine/dmaobj.h>
@@ -75,6 +76,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -106,6 +108,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -137,6 +140,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -167,6 +171,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -198,6 +203,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -229,6 +235,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -259,6 +266,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvc0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -290,6 +298,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

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

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

#include <subdev/bar.h>

#include <subdev/pwr.h>

#include <subdev/volt.h>



#include <engine/device.h>

#include <engine/dmaobj.h>
@@ -75,6 +76,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -107,6 +109,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -139,6 +142,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -171,6 +175,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
@@ -205,6 +210,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nv108_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;