Commit 93d90ad7 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/sec: separate from cipher (formerly crypt) 



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.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent eccf7e8a

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

+2 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ struct nv_device_v0 { 
#define NV_DEVICE_V0_DISABLE_MPEG                         0x0000000200000000ULL

#define NV_DEVICE_V0_DISABLE_ME                           0x0000000400000000ULL

#define NV_DEVICE_V0_DISABLE_VP                           0x0000000800000000ULL

#define NV_DEVICE_V0_DISABLE_CRYPT                        0x0000001000000000ULL

#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
@@ -135,6 +135,7 @@ struct nv_device_v0 { 
#define NV_DEVICE_V0_DISABLE_VENC                         0x0000040000000000ULL

#define NV_DEVICE_V0_DISABLE_COPY2                        0x0000080000000000ULL

#define NV_DEVICE_V0_DISABLE_MSVLD                        0x0000100000000000ULL

#define NV_DEVICE_V0_DISABLE_SEC                          0x0000200000000000ULL

	__u64 disable;	/* disable particular subsystems */

	__u64 debug0;	/* as above, but *internal* ids, and *NOT* ABI */

};

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

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ enum nv_subdev_type { 
	NVDEV_ENGINE_MPEG,

	NVDEV_ENGINE_ME,

	NVDEV_ENGINE_VP,

	NVDEV_ENGINE_CRYPT,

	NVDEV_ENGINE_CIPHER,

	NVDEV_ENGINE_BSP,

	NVDEV_ENGINE_PPP,

	NVDEV_ENGINE_COPY0,
@@ -60,6 +60,7 @@ enum nv_subdev_type { 
	NVDEV_ENGINE_DISP,

	NVDEV_ENGINE_PERFMON,

	NVDEV_ENGINE_MSVLD,

	NVDEV_ENGINE_SEC,



	NVDEV_SUBDEV_NR,

};

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

0 → 100644
+4 −0
Original line number Diff line number Diff line 
#ifndef __NVKM_CIPHER_H__

#define __NVKM_CIPHER_H__

extern struct nouveau_oclass nv84_cipher_oclass;

#endif

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

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

#define __NOUVEAU_CRYPT_H__



extern struct nouveau_oclass nv84_crypt_oclass;

extern struct nouveau_oclass nv98_crypt_oclass;



#endif

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

0 → 100644
+4 −0
Original line number Diff line number Diff line 
#ifndef __NVKM_SEC_H__

#define __NVKM_SEC_H__

extern struct nouveau_oclass nv98_sec_oclass;

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE