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

Commit 87c33f4e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/msvld: namespace + nvidia gpu names (no binary change) 



The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver.  This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).

Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.

A comparison of objdump disassemblies proves no code changes.

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

drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h

+4 −3
Original line number Diff line number Diff line 
#ifndef __NVKM_MSVLD_H__

#define __NVKM_MSVLD_H__

extern struct nouveau_oclass nv98_msvld_oclass;

extern struct nouveau_oclass nvc0_msvld_oclass;

extern struct nouveau_oclass nve0_msvld_oclass;

#include <core/engine.h>

extern struct nvkm_oclass g98_msvld_oclass;

extern struct nvkm_oclass gf100_msvld_oclass;

extern struct nvkm_oclass gk104_msvld_oclass;

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ gm100_identify(struct nouveau_device *device) 
#endif

		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

#endif
@@ -137,7 +137,7 @@ gm100_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gm204_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gm204_ce1_oclass;

		device->oclass[NVDEV_ENGINE_CE2    ] = &gm204_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

#endif

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

+7 −7
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_SEC    ] = &nv98_sec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
@@ -314,7 +314,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_SEC    ] = &nv98_sec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
@@ -343,7 +343,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_SEC    ] = &nv98_sec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
@@ -373,7 +373,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MPEG   ] = &g84_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -403,7 +403,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -433,7 +433,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -463,7 +463,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;

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

+9 −9
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf100_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;
@@ -118,7 +118,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;
@@ -151,7 +151,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -183,7 +183,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;
@@ -216,7 +216,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -248,7 +248,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf108_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -280,7 +280,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf110_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;
@@ -313,7 +313,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf119_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gf110_disp_oclass;
@@ -343,7 +343,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf117_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gf110_disp_oclass;

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

+7 −7
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;

		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
@@ -122,7 +122,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;

		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
@@ -156,7 +156,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;

		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
@@ -212,7 +212,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;

		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;
@@ -246,7 +246,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;

		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;
@@ -280,7 +280,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;

		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		break;
@@ -313,7 +313,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;

		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		break;