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

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

drm/nouveau/mc: 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 2799bba6

drivers/gpu/drm/nouveau/include/nvkm/core/os.h

+1 −0
Original line number Diff line number Diff line
@@ -239,5 +239,6 @@ 
#define nouveau_fb_tile nvkm_fb_tile

#define nvc0_pte_storage_type_map gf100_pte_storage_type_map

#define nouveau_fuse nvkm_fuse

#define nouveau_mc nvkm_mc



#endif

drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h

+0 −1
Original line number Diff line number Diff line
@@ -28,5 +28,4 @@ nvkm_ltc(void *obj) 
extern struct nvkm_oclass *gf100_ltc_oclass;

extern struct nvkm_oclass *gk104_ltc_oclass;

extern struct nvkm_oclass *gm107_ltc_oclass;



#endif

drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h

+18 −21
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_MC_H__

#define __NOUVEAU_MC_H__



#ifndef __NVKM_MC_H__

#define __NVKM_MC_H__

#include <core/subdev.h>

#include <core/device.h>



struct nouveau_mc {

	struct nouveau_subdev base;

struct nvkm_mc {

	struct nvkm_subdev base;

	bool use_msi;

	unsigned int irq;

	void (*unk260)(struct nouveau_mc *, u32);

	void (*unk260)(struct nvkm_mc *, u32);

};



static inline struct nouveau_mc *

nouveau_mc(void *obj)

static inline struct nvkm_mc *

nvkm_mc(void *obj)

{

	return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_MC);

	return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_MC);

}



extern struct nouveau_oclass *nv04_mc_oclass;

extern struct nouveau_oclass *nv40_mc_oclass;

extern struct nouveau_oclass *nv44_mc_oclass;

extern struct nouveau_oclass *nv4c_mc_oclass;

extern struct nouveau_oclass *nv50_mc_oclass;

extern struct nouveau_oclass *nv94_mc_oclass;

extern struct nouveau_oclass *nv98_mc_oclass;

extern struct nouveau_oclass *nvc0_mc_oclass;

extern struct nouveau_oclass *nvc3_mc_oclass;

extern struct nouveau_oclass *gk20a_mc_oclass;



extern struct nvkm_oclass *nv04_mc_oclass;

extern struct nvkm_oclass *nv40_mc_oclass;

extern struct nvkm_oclass *nv44_mc_oclass;

extern struct nvkm_oclass *nv4c_mc_oclass;

extern struct nvkm_oclass *nv50_mc_oclass;

extern struct nvkm_oclass *g94_mc_oclass;

extern struct nvkm_oclass *g98_mc_oclass;

extern struct nvkm_oclass *gf100_mc_oclass;

extern struct nvkm_oclass *gf106_mc_oclass;

extern struct nvkm_oclass *gk20a_mc_oclass;

#endif

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

+10 −10
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  g94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;
@@ -213,7 +213,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  g94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;
@@ -242,7 +242,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  g98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;
@@ -271,7 +271,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  g98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;
@@ -300,7 +300,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  g98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  mcp77_fb_oclass;
@@ -329,7 +329,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  g98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  mcp77_fb_oclass;
@@ -358,7 +358,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gt215_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  g98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gt215_fb_oclass;
@@ -389,7 +389,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gt215_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  g98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gt215_fb_oclass;
@@ -419,7 +419,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gt215_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  g98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gt215_fb_oclass;
@@ -449,7 +449,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  mcp89_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  g98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  mcp89_fb_oclass;

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

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

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf100_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;
@@ -102,7 +102,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf100_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;
@@ -135,7 +135,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;
@@ -167,7 +167,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf100_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;
@@ -200,7 +200,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;
@@ -232,7 +232,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;
@@ -264,7 +264,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf100_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;
@@ -297,7 +297,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;
@@ -329,7 +329,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;