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

drm/nouveau/msppp: rename from ppp (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 d5752b9b

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

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct nv_device_v0 { 
#define NV_DEVICE_V0_DISABLE_VP                           0x0000000800000000ULL

#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_MSPPP                        0x0000004000000000ULL

#define NV_DEVICE_V0_DISABLE_CE0                          0x0000008000000000ULL

#define NV_DEVICE_V0_DISABLE_CE1                          0x0000010000000000ULL

#define NV_DEVICE_V0_DISABLE_VIC                          0x0000020000000000ULL
@@ -349,7 +349,7 @@ struct kepler_channel_gpfifo_a_v0 { 
	__u8  version;

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_GR                               0x01

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_VP                               0x02

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_PPP                              0x04

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_MSPPP                            0x04

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_MSVLD                            0x08

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE0                              0x10

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE1                              0x20

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ enum nv_subdev_type { 
	NVDEV_ENGINE_VP,

	NVDEV_ENGINE_CIPHER,

	NVDEV_ENGINE_BSP,

	NVDEV_ENGINE_PPP,

	NVDEV_ENGINE_MSPPP,

	NVDEV_ENGINE_CE0,

	NVDEV_ENGINE_CE1,

	NVDEV_ENGINE_CE2,

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

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_MSPPP_H__

#define __NOUVEAU_MSPPP_H__



extern struct nouveau_oclass nv98_msppp_oclass;

extern struct nouveau_oclass nvc0_msppp_oclass;



#endif

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

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_PPP_H__

#define __NOUVEAU_PPP_H__



extern struct nouveau_oclass nv98_ppp_oclass;

extern struct nouveau_oclass nvc0_ppp_oclass;



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ include $(src)/nvkm/engine/gr/Kbuild 
include $(src)/nvkm/engine/mpeg/Kbuild

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

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

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

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

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE