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

drm/nouveau/dmaobj: update to an improved style of class definition 



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

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

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ gm100_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_PWR    ] =  nv108_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

#endif

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv108_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gm107_graph_oclass;

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

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv04_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv04_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv04_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv04_graph_oclass;
@@ -74,7 +74,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv04_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv04_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv04_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv04_graph_oclass;

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

+8 −8
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;

		break;
@@ -75,7 +75,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;
@@ -94,7 +94,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;
@@ -113,7 +113,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv1a_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;
@@ -132,7 +132,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;
@@ -151,7 +151,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;
@@ -170,7 +170,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv1a_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;
@@ -189,7 +189,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv10_graph_oclass;

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

+4 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv20_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv20_graph_oclass;
@@ -78,7 +78,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv25_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv25_graph_oclass;
@@ -97,7 +97,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv25_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv25_graph_oclass;
@@ -116,7 +116,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv25_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv2a_graph_oclass;

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

+5 −5
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv30_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv30_graph_oclass;
@@ -78,7 +78,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv35_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv35_graph_oclass;
@@ -97,7 +97,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv30_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv30_graph_oclass;
@@ -117,7 +117,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv36_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv35_graph_oclass;
@@ -137,7 +137,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_FB     ] =  nv10_fb_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_DMAOBJ ] =  nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv34_graph_oclass;