diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-11-08 03:18:19 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-01-11 04:17:40 +0300 |
| commit | 08f7633c1de8007c3735764d5ca0c1bde4239b84 (patch) | |
| tree | e7822b91fe7353021b43b698ba582809faa8de93 /drivers/gpu/drm/nouveau/include | |
| parent | 21f560e990441a86a380c0e981c6017d6fd8360c (diff) | |
| download | linux-08f7633c1de8007c3735764d5ca0c1bde4239b84.tar.xz | |
drm/nouveau/nvif: move internal class identifiers to class.h
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/class.h | 11 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/ioctl.h | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h index 95a64d89547c..8bf8161f9730 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/class.h +++ b/drivers/gpu/drm/nouveau/include/nvif/class.h @@ -1,9 +1,14 @@ #ifndef __NVIF_CLASS_H__ #define __NVIF_CLASS_H__ -/******************************************************************************* - * class identifiers - ******************************************************************************/ +/* these class numbers are made up by us, and not nvidia-assigned */ +#define NVIF_CLASS_CONTROL -1 +#define NVIF_CLASS_PERFMON -2 +#define NVIF_CLASS_PERFDOM -3 +#define NVIF_CLASS_SW_NV04 -4 +#define NVIF_CLASS_SW_NV10 -5 +#define NVIF_CLASS_SW_NV50 -6 +#define NVIF_CLASS_SW_GF100 -7 /* the below match nvidia-assigned (either in hw, or sw) class numbers */ #define NV_DEVICE 0x00000080 diff --git a/drivers/gpu/drm/nouveau/include/nvif/ioctl.h b/drivers/gpu/drm/nouveau/include/nvif/ioctl.h index b0ac0215ebf9..c5f5eb83a594 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/ioctl.h +++ b/drivers/gpu/drm/nouveau/include/nvif/ioctl.h @@ -55,14 +55,6 @@ struct nvif_ioctl_new_v0 { __u64 token; __u64 object; __u32 handle; -/* these class numbers are made up by us, and not nvidia-assigned */ -#define NVIF_IOCTL_NEW_V0_CONTROL -1 -#define NVIF_IOCTL_NEW_V0_PERFMON -2 -#define NVIF_IOCTL_NEW_V0_PERFDOM -3 -#define NVIF_IOCTL_NEW_V0_SW_NV04 -4 -#define NVIF_IOCTL_NEW_V0_SW_NV10 -5 -#define NVIF_IOCTL_NEW_V0_SW_NV50 -6 -#define NVIF_IOCTL_NEW_V0_SW_GF100 -7 __s32 oclass; __u8 data[]; /* class data (class.h) */ }; |