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

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

drm/nouveau/mspdec: 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 e7c29683

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

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

#define __NVKM_MSPDEC_H__

extern struct nouveau_oclass nv98_mspdec_oclass;

extern struct nouveau_oclass nvc0_mspdec_oclass;

extern struct nouveau_oclass nve0_mspdec_oclass;

#include <core/engine.h>

extern struct nvkm_oclass g98_mspdec_oclass;

extern struct nvkm_oclass gf100_mspdec_oclass;

extern struct nvkm_oclass gk104_mspdec_oclass;

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ gm100_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

#endif

		break;
@@ -138,7 +138,7 @@ gm100_identify(struct nouveau_device *device) 
		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_MSPDEC ] = &nve0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

#endif

		break;

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

+7 −7
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_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_MSPPP  ] = &nv98_msppp_oclass;
@@ -312,7 +312,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_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_MSPPP  ] = &nv98_msppp_oclass;
@@ -341,7 +341,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_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_MSPPP  ] = &nv98_msppp_oclass;
@@ -372,7 +372,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_MPEG   ] = &g84_mpeg_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nv98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;
@@ -402,7 +402,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nv98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;
@@ -432,7 +432,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nv98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;
@@ -462,7 +462,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nv98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;

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

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

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf100_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
@@ -117,7 +117,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
@@ -150,7 +150,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
@@ -182,7 +182,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
@@ -215,7 +215,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
@@ -247,7 +247,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf108_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
@@ -279,7 +279,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf110_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
@@ -312,7 +312,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf119_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
@@ -342,7 +342,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gf117_gr_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

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

+7 −7
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ nve0_identify(struct nouveau_device *device) 
		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_MSPDEC ] = &nve0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;

		break;
@@ -123,7 +123,7 @@ nve0_identify(struct nouveau_device *device) 
		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_MSPDEC ] = &nve0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;

		break;
@@ -157,7 +157,7 @@ nve0_identify(struct nouveau_device *device) 
		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_MSPDEC ] = &nve0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;

		break;
@@ -213,7 +213,7 @@ nve0_identify(struct nouveau_device *device) 
		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_MSPDEC ] = &nve0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;

		break;
@@ -247,7 +247,7 @@ nve0_identify(struct nouveau_device *device) 
		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_MSPDEC ] = &nve0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;

		break;
@@ -281,7 +281,7 @@ nve0_identify(struct nouveau_device *device) 
		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_MSPDEC ] = &nve0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		break;

	case 0x108:
@@ -314,7 +314,7 @@ nve0_identify(struct nouveau_device *device) 
		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_MSPDEC ] = &nve0_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		break;

	default: