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

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

drm/nouveau/msppp: 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 e3332c20

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

+5 −6
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_MSPPP_H__

#define __NOUVEAU_MSPPP_H__



extern struct nouveau_oclass nv98_msppp_oclass;

extern struct nouveau_oclass nvc0_msppp_oclass;



#ifndef __NVKM_MSPPP_H__

#define __NVKM_MSPPP_H__

#include <core/engine.h>

extern struct nvkm_oclass g98_msppp_oclass;

extern struct nvkm_oclass gf100_msppp_oclass;

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ gm100_identify(struct nouveau_device *device) 
#if 0

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

#endif

		break;

	case 0x124:
@@ -139,7 +139,7 @@ gm100_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE2    ] = &gm204_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

#endif

		break;

	default:

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

+7 −7
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ nv50_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;

		break;
@@ -315,7 +315,7 @@ nv50_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;

		break;
@@ -344,7 +344,7 @@ nv50_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;

		break;
@@ -374,7 +374,7 @@ nv50_identify(struct nouveau_device *device) 
		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_MSPPP  ] = &nv98_msppp_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;

		device->oclass[NVDEV_ENGINE_PM     ] =  nva3_pm_oclass;
@@ -404,7 +404,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_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nv98_msppp_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;

		device->oclass[NVDEV_ENGINE_PM     ] =  nva3_pm_oclass;
@@ -434,7 +434,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_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nv98_msppp_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;

		device->oclass[NVDEV_ENGINE_PM     ] =  nva3_pm_oclass;
@@ -464,7 +464,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_MSVLD  ] = &nv98_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nv98_msppp_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;

		device->oclass[NVDEV_ENGINE_PM     ] =  nva3_pm_oclass;

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

+9 −9
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ nvc0_identify(struct nouveau_device *device) 
		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_MSPPP  ] = &nvc0_msppp_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;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -119,7 +119,7 @@ nvc0_identify(struct nouveau_device *device) 
		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_MSPPP  ] = &nvc0_msppp_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;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -152,7 +152,7 @@ nvc0_identify(struct nouveau_device *device) 
		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_MSPPP  ] = &nvc0_msppp_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;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
@@ -184,7 +184,7 @@ nvc0_identify(struct nouveau_device *device) 
		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_MSPPP  ] = &nvc0_msppp_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;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -217,7 +217,7 @@ nvc0_identify(struct nouveau_device *device) 
		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_MSPPP  ] = &nvc0_msppp_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;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
@@ -249,7 +249,7 @@ nvc0_identify(struct nouveau_device *device) 
		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_MSPPP  ] = &nvc0_msppp_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;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
@@ -281,7 +281,7 @@ nvc0_identify(struct nouveau_device *device) 
		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_MSPPP  ] = &nvc0_msppp_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;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -314,7 +314,7 @@ nvc0_identify(struct nouveau_device *device) 
		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_MSPPP  ] = &nvc0_msppp_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;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
@@ -344,7 +344,7 @@ nvc0_identify(struct nouveau_device *device) 
		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_MSPPP  ] = &nvc0_msppp_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;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;

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

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

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;

		break;

	case 0xe7:
@@ -124,7 +124,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;

		break;

	case 0xe6:
@@ -158,7 +158,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;

		break;

	case 0xea:
@@ -214,7 +214,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;

		break;

	case 0xf1:
@@ -248,7 +248,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;

		break;

	case 0x106:
@@ -282,7 +282,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		break;

	case 0x108:

		device->cname = "GK208";
@@ -315,7 +315,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		break;

	default:

		nv_fatal(device, "unknown Kepler chipset\n");