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

drm/nouveau/ce: rename from copy (no binary change) 



Switch to NVIDIA's name for the device.

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 93d90ad7

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

+3 −3
Original line number Diff line number Diff line
@@ -129,11 +129,11 @@ struct nv_device_v0 { 
#define NV_DEVICE_V0_DISABLE_CIPHER                       0x0000001000000000ULL

#define NV_DEVICE_V0_DISABLE_BSP                          0x0000002000000000ULL

#define NV_DEVICE_V0_DISABLE_PPP                          0x0000004000000000ULL

#define NV_DEVICE_V0_DISABLE_COPY0                        0x0000008000000000ULL

#define NV_DEVICE_V0_DISABLE_COPY1                        0x0000010000000000ULL

#define NV_DEVICE_V0_DISABLE_CE0                          0x0000008000000000ULL

#define NV_DEVICE_V0_DISABLE_CE1                          0x0000010000000000ULL

#define NV_DEVICE_V0_DISABLE_VIC                          0x0000020000000000ULL

#define NV_DEVICE_V0_DISABLE_VENC                         0x0000040000000000ULL

#define NV_DEVICE_V0_DISABLE_COPY2                        0x0000080000000000ULL

#define NV_DEVICE_V0_DISABLE_CE2                          0x0000080000000000ULL

#define NV_DEVICE_V0_DISABLE_MSVLD                        0x0000100000000000ULL

#define NV_DEVICE_V0_DISABLE_SEC                          0x0000200000000000ULL

	__u64 disable;	/* disable particular subsystems */

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

+3 −3
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ enum nv_subdev_type { 
	NVDEV_ENGINE_CIPHER,

	NVDEV_ENGINE_BSP,

	NVDEV_ENGINE_PPP,

	NVDEV_ENGINE_COPY0,

	NVDEV_ENGINE_COPY1,

	NVDEV_ENGINE_COPY2,

	NVDEV_ENGINE_CE0,

	NVDEV_ENGINE_CE1,

	NVDEV_ENGINE_CE2,

	NVDEV_ENGINE_VIC,

	NVDEV_ENGINE_VENC,

	NVDEV_ENGINE_DISP,

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

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#ifndef __NVKM_CE_H__

#define __NVKM_CE_H__



void nva3_ce_intr(struct nouveau_subdev *);



extern struct nouveau_oclass nva3_ce_oclass;

extern struct nouveau_oclass nvc0_ce0_oclass;

extern struct nouveau_oclass nvc0_ce1_oclass;

extern struct nouveau_oclass nve0_ce0_oclass;

extern struct nouveau_oclass nve0_ce1_oclass;

extern struct nouveau_oclass nve0_ce2_oclass;



#endif

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

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_COPY_H__

#define __NOUVEAU_COPY_H__



void nva3_copy_intr(struct nouveau_subdev *);



extern struct nouveau_oclass nva3_copy_oclass;

extern struct nouveau_oclass nvc0_copy0_oclass;

extern struct nouveau_oclass nvc0_copy1_oclass;

extern struct nouveau_oclass nve0_copy0_oclass;

extern struct nouveau_oclass nve0_copy1_oclass;

extern struct nouveau_oclass nve0_copy2_oclass;



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ nvkm-y += nvkm/engine/xtensa.o 


include $(src)/nvkm/engine/bsp/Kbuild

include $(src)/nvkm/engine/cipher/Kbuild

include $(src)/nvkm/engine/copy/Kbuild

include $(src)/nvkm/engine/ce/Kbuild

include $(src)/nvkm/engine/device/Kbuild

include $(src)/nvkm/engine/disp/Kbuild

include $(src)/nvkm/engine/dmaobj/Kbuild

CRA Git | Maintained and supported by SUSTech CRA and CCSE