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

Commit 9719047b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/device: 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 a56866a9

drivers/gpu/drm/nouveau/include/nvif/device.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void nvif_device_ref(struct nvif_device *, struct nvif_device **); 
#define nvxx_wait_cb(a,b,c) nv_wait_cb(nvxx_timer(a), (b), (c))

#define nvxx_therm(a) nouveau_therm(nvxx_device(a))



#include <engine/device.h>

#include <core/device.h>

#include <engine/fifo.h>

#include <engine/gr.h>

#include <engine/sw.h>

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

+14 −0
Original line number Diff line number Diff line
@@ -84,4 +84,18 @@ nv_device_resource_len(struct nvkm_device *device, unsigned int bar); 


int

nv_device_get_irq(struct nvkm_device *device, bool stall);



struct platform_device;



enum nv_bus_type {

	NVKM_BUS_PCI,

	NVKM_BUS_PLATFORM,

};



#define nvkm_device_create(p,t,n,s,c,d,u)                                   \

	nvkm_device_create_((void *)(p), (t), (n), (s), (c), (d),           \

			       sizeof(**u), (void **)u)

int  nvkm_device_create_(void *, enum nv_bus_type type, u64 name,

			    const char *sname, const char *cfg, const char *dbg,

			    int, void **);

#endif

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

+2 −0
Original line number Diff line number Diff line
@@ -253,5 +253,7 @@ 
#define nouveau_gr nvkm_gr

#define nouveau_sw nvkm_sw

#define nouveau_sw_chan nvkm_sw_chan

#define nouveau_device_create nvkm_device_create

#define nouveau_device_create_ nvkm_device_create_



#endif

drivers/gpu/drm/nouveau/nouveau_drm.c

+2 −2
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev, 
		remove_conflicting_framebuffers(aper, "nouveaufb", boot);

	kfree(aper);



	ret = nouveau_device_create(pdev, NOUVEAU_BUS_PCI,

	ret = nouveau_device_create(pdev, NVKM_BUS_PCI,

				    nouveau_pci_name(pdev), pci_name(pdev),

				    nouveau_config, nouveau_debug, &device);

	if (ret)
@@ -1056,7 +1056,7 @@ nouveau_platform_device_create_(struct platform_device *pdev, int size, 
	struct drm_device *drm;

	int err;



	err = nouveau_device_create_(pdev, NOUVEAU_BUS_PLATFORM,

	err = nouveau_device_create_(pdev, NVKM_BUS_PLATFORM,

				    nouveau_platform_name(pdev),

				    dev_name(&pdev->dev), nouveau_config,

				    nouveau_debug, size, pobject);

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

+2 −2
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ nvkm-y += nvkm/engine/device/nv20.o 
nvkm-y += nvkm/engine/device/nv30.o

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

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

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

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

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

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

nvkm-y += nvkm/engine/device/gm100.o