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

Commit 4d34686e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/pm: 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 87c33f4e

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

+15 −19
Original line number Diff line number Diff line 
#ifndef __NVKM_PM_H__

#define __NVKM_PM_H__



#include <core/device.h>

#include <core/engine.h>

#include <core/engctx.h>



struct nouveau_perfdom;

struct nouveau_perfctr;

struct nouveau_pm {

	struct nouveau_engine base;

struct nvkm_perfdom;

struct nvkm_perfctr;

struct nvkm_pm {

	struct nvkm_engine base;



	struct nouveau_perfctx *context;

	struct nvkm_perfctx *context;

	void *profile_data;



	struct list_head domains;
@@ -21,18 +18,17 @@ struct nouveau_pm { 
	u32 last;

};



static inline struct nouveau_pm *

nouveau_pm(void *obj)

static inline struct nvkm_pm *

nvkm_pm(void *obj)

{

	return (void *)nouveau_engine(obj, NVDEV_ENGINE_PM);

	return (void *)nvkm_engine(obj, NVDEV_ENGINE_PM);

}



extern struct nouveau_oclass *nv40_pm_oclass;

extern struct nouveau_oclass *nv50_pm_oclass;

extern struct nouveau_oclass *nv84_pm_oclass;

extern struct nouveau_oclass *nva3_pm_oclass;

extern struct nouveau_oclass nvc0_pm_oclass;

extern struct nouveau_oclass nve0_pm_oclass;

extern struct nouveau_oclass nvf0_pm_oclass;



extern struct nvkm_oclass *nv40_pm_oclass;

extern struct nvkm_oclass *nv50_pm_oclass;

extern struct nvkm_oclass *g84_pm_oclass;

extern struct nvkm_oclass *gt215_pm_oclass;

extern struct nvkm_oclass gf100_pm_oclass;

extern struct nvkm_oclass gk104_pm_oclass;

extern struct nvkm_oclass gk110_pm_oclass;

#endif

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

+13 −13
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g84_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;

		break;

	case 0x86:

		device->cname = "G86";
@@ -143,7 +143,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g84_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;

		break;

	case 0x92:

		device->cname = "G92";
@@ -172,7 +172,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g84_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;

		break;

	case 0x94:

		device->cname = "G94";
@@ -201,7 +201,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;

		break;

	case 0x96:

		device->cname = "G96";
@@ -230,7 +230,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;

		break;

	case 0x98:

		device->cname = "G98";
@@ -259,7 +259,7 @@ nv50_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;

		break;

	case 0xa0:

		device->cname = "G200";
@@ -288,7 +288,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt200_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;

		break;

	case 0xaa:

		device->cname = "MCP77/MCP78";
@@ -317,7 +317,7 @@ nv50_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;

		break;

	case 0xac:

		device->cname = "MCP79/MCP7A";
@@ -346,7 +346,7 @@ nv50_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;

		break;

	case 0xa3:

		device->cname = "GT215";
@@ -377,7 +377,7 @@ nv50_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] =  gt215_pm_oclass;

		break;

	case 0xa5:

		device->cname = "GT216";
@@ -407,7 +407,7 @@ nv50_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] =  gt215_pm_oclass;

		break;

	case 0xa8:

		device->cname = "GT218";
@@ -437,7 +437,7 @@ nv50_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] =  gt215_pm_oclass;

		break;

	case 0xaf:

		device->cname = "MCP89";
@@ -467,7 +467,7 @@ nv50_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] =  gt215_pm_oclass;

		break;

	default:

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

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

+9 −9
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &gf100_pm_oclass;

		break;

	case 0xc4:

		device->cname = "GF104";
@@ -123,7 +123,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &gf100_pm_oclass;

		break;

	case 0xc3:

		device->cname = "GF106";
@@ -155,7 +155,7 @@ nvc0_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] = &gf100_pm_oclass;

		break;

	case 0xce:

		device->cname = "GF114";
@@ -188,7 +188,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &gf100_pm_oclass;

		break;

	case 0xcf:

		device->cname = "GF116";
@@ -220,7 +220,7 @@ nvc0_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] = &gf100_pm_oclass;

		break;

	case 0xc1:

		device->cname = "GF108";
@@ -252,7 +252,7 @@ nvc0_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] = &gf100_pm_oclass;

		break;

	case 0xc8:

		device->cname = "GF110";
@@ -285,7 +285,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &gf100_pm_oclass;

		break;

	case 0xd9:

		device->cname = "GF119";
@@ -317,7 +317,7 @@ nvc0_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] = &gf100_pm_oclass;

		break;

	case 0xd7:

		device->cname = "GF117";
@@ -347,7 +347,7 @@ nvc0_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] = &gf100_pm_oclass;

		break;

	default:

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

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

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

		device->oclass[NVDEV_ENGINE_PM     ] = &gk104_pm_oclass;

		break;

	case 0xe7:

		device->cname = "GK107";
@@ -125,7 +125,7 @@ nve0_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] = &gk104_pm_oclass;

		break;

	case 0xe6:

		device->cname = "GK106";
@@ -159,7 +159,7 @@ nve0_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] = &gk104_pm_oclass;

		break;

	case 0xea:

		device->cname = "GK20A";
@@ -179,7 +179,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gk20a_gr_oclass;

		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &gk104_pm_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &gk20a_volt_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  gk20a_pmu_oclass;

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

		device->oclass[NVDEV_ENGINE_PM     ] = &gk110_pm_oclass;

		break;

	case 0xf1:

		device->cname = "GK110B";
@@ -249,7 +249,7 @@ nve0_identify(struct nouveau_device *device) 
		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;

		device->oclass[NVDEV_ENGINE_PM     ] = &gk110_pm_oclass;

		break;

	case 0x106:

		device->cname = "GK208B";

drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild

+5 −5
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ nvkm-y += nvkm/engine/pm/base.o 
nvkm-y += nvkm/engine/pm/daemon.o

nvkm-y += nvkm/engine/pm/nv40.o

nvkm-y += nvkm/engine/pm/nv50.o

nvkm-y += nvkm/engine/pm/nv84.o

nvkm-y += nvkm/engine/pm/nva3.o

nvkm-y += nvkm/engine/pm/nvc0.o

nvkm-y += nvkm/engine/pm/nve0.o

nvkm-y += nvkm/engine/pm/nvf0.o
 
nvkm-y += nvkm/engine/pm/g84.o

nvkm-y += nvkm/engine/pm/gt215.o

nvkm-y += nvkm/engine/pm/gf100.o

nvkm-y += nvkm/engine/pm/gk104.o

nvkm-y += nvkm/engine/pm/gk110.o