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

Commit 245dcfe9 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/bar: 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 5025407b

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

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ 
#define nouveau_vm_put nvkm_vm_put

#define nouveau_vm_map nvkm_vm_map

#define nouveau_vm_unmap nvkm_vm_unmap

#define nouveau_vm_new nvkm_vm_new

#define nouveau_vm_ref nvkm_vm_ref

#define nouveau_instmem nvkm_instmem

#define nouveau_instobj nvkm_instobj

#define nouveau_mem nvkm_mem

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

+20 −24
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_BAR_H__

#define __NOUVEAU_BAR_H__



#ifndef __NVKM_BAR_H__

#define __NVKM_BAR_H__

#include <core/subdev.h>

#include <core/device.h>



struct nouveau_mem;

struct nouveau_vma;

struct nvkm_mem;

struct nvkm_vma;



struct nouveau_bar {

	struct nouveau_subdev base;

struct nvkm_bar {

	struct nvkm_subdev base;



	int (*alloc)(struct nouveau_bar *, struct nouveau_object *,

		     struct nouveau_mem *, struct nouveau_object **);

	int  (*alloc)(struct nvkm_bar *, struct nvkm_object *,

		      struct nvkm_mem *, struct nvkm_object **);



	int (*kmap)(struct nouveau_bar *, struct nouveau_mem *,

		    u32 flags, struct nouveau_vma *);

	int (*umap)(struct nouveau_bar *, struct nouveau_mem *,

		    u32 flags, struct nouveau_vma *);

	void (*unmap)(struct nouveau_bar *, struct nouveau_vma *);

	void (*flush)(struct nouveau_bar *);

	int  (*kmap)(struct nvkm_bar *, struct nvkm_mem *, u32 flags,

		     struct nvkm_vma *);

	int  (*umap)(struct nvkm_bar *, struct nvkm_mem *, u32 flags,

		     struct nvkm_vma *);

	void (*unmap)(struct nvkm_bar *, struct nvkm_vma *);

	void (*flush)(struct nvkm_bar *);



	/* whether the BAR supports to be ioremapped WC or should be uncached */

	bool iomap_uncached;

};



static inline struct nouveau_bar *

nouveau_bar(void *obj)

static inline struct nvkm_bar *

nvkm_bar(void *obj)

{

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

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

}



extern struct nouveau_oclass nv50_bar_oclass;

extern struct nouveau_oclass nvc0_bar_oclass;

extern struct nouveau_oclass gk20a_bar_oclass;



extern struct nvkm_oclass nv50_bar_oclass;

extern struct nvkm_oclass gf100_bar_oclass;

extern struct nvkm_oclass gk20a_bar_oclass;

#endif

drivers/gpu/drm/nouveau/nvkm/core/ramht.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include <core/ramht.h>

#include <core/engine.h>



#include <subdev/bar.h>

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

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

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  nv108_pmu_oclass;



#if 0
@@ -121,7 +121,7 @@ gm100_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  nv108_pmu_oclass;

#if 0

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

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

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

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  nvc0_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvc0_dmaeng_oclass;
@@ -110,7 +110,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  nvc0_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvc0_dmaeng_oclass;
@@ -143,7 +143,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  nvc0_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvc0_dmaeng_oclass;
@@ -175,7 +175,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  nvc0_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvc0_dmaeng_oclass;
@@ -208,7 +208,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  nvc0_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvc0_dmaeng_oclass;
@@ -240,7 +240,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  nvc0_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvc0_dmaeng_oclass;
@@ -272,7 +272,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  nvc0_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvc0_dmaeng_oclass;
@@ -305,7 +305,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  nvd0_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvd0_dmaeng_oclass;
@@ -337,7 +337,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nvc0_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;