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

Commit 5ecfadeb authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/ibus: 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 b9ec1424

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

+21 −24
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_IBUS_H__

#define __NOUVEAU_IBUS_H__



#ifndef __NVKM_IBUS_H__

#define __NVKM_IBUS_H__

#include <core/subdev.h>

#include <core/device.h>



struct nouveau_ibus {

	struct nouveau_subdev base;

struct nvkm_ibus {

	struct nvkm_subdev base;

};



static inline struct nouveau_ibus *

nouveau_ibus(void *obj)

static inline struct nvkm_ibus *

nvkm_ibus(void *obj)

{

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

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

}



#define nouveau_ibus_create(p,e,o,d)                                           \

	nouveau_subdev_create_((p), (e), (o), 0, "PIBUS", "ibus",              \

#define nvkm_ibus_create(p,e,o,d)                                           \

	nvkm_subdev_create_((p), (e), (o), 0, "PIBUS", "ibus",              \

			       sizeof(**d), (void **)d)

#define nouveau_ibus_destroy(p)                                                \

	nouveau_subdev_destroy(&(p)->base)

#define nouveau_ibus_init(p)                                                   \

	nouveau_subdev_init(&(p)->base)

#define nouveau_ibus_fini(p,s)                                                 \

	nouveau_subdev_fini(&(p)->base, (s))



#define _nouveau_ibus_dtor _nouveau_subdev_dtor

#define _nouveau_ibus_init _nouveau_subdev_init

#define _nouveau_ibus_fini _nouveau_subdev_fini

#define nvkm_ibus_destroy(p)                                                \

	nvkm_subdev_destroy(&(p)->base)

#define nvkm_ibus_init(p)                                                   \

	nvkm_subdev_init(&(p)->base)

#define nvkm_ibus_fini(p,s)                                                 \

	nvkm_subdev_fini(&(p)->base, (s))



extern struct nouveau_oclass nvc0_ibus_oclass;

extern struct nouveau_oclass nve0_ibus_oclass;

extern struct nouveau_oclass gk20a_ibus_oclass;

#define _nvkm_ibus_dtor _nvkm_subdev_dtor

#define _nvkm_ibus_init _nvkm_subdev_init

#define _nvkm_ibus_fini _nvkm_subdev_fini



extern struct nvkm_oclass gf100_ibus_oclass;

extern struct nvkm_oclass gk104_ibus_oclass;

extern struct nvkm_oclass gk20a_ibus_oclass;

#endif

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

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

		device->oclass[NVDEV_SUBDEV_FB     ] =  gm107_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gm107_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk104_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -118,7 +118,7 @@ gm100_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gm107_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gm107_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk104_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

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

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

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gf100_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -107,7 +107,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gf100_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -140,7 +140,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gf100_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -172,7 +172,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gf100_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -205,7 +205,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gf100_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -237,7 +237,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gf100_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -269,7 +269,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gf100_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -302,7 +302,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gf100_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -334,7 +334,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gf100_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

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

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

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk104_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -108,7 +108,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk104_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -142,7 +142,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk104_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -198,7 +198,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk104_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -232,7 +232,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk104_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -266,7 +266,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk104_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
@@ -299,7 +299,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk104_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

drivers/gpu/drm/nouveau/nvkm/subdev/ibus/Kbuild

+2 −2
Original line number Diff line number Diff line 
nvkm-y += nvkm/subdev/ibus/nvc0.o

nvkm-y += nvkm/subdev/ibus/nve0.o

nvkm-y += nvkm/subdev/ibus/gf100.o

nvkm-y += nvkm/subdev/ibus/gk104.o

nvkm-y += nvkm/subdev/ibus/gk20a.o