From bc9df802feaeff0b1d7d1a2fc964267ebd10058d Mon Sep 17 00:00:00 2001 From: Sachit Kadle Date: Tue, 25 Oct 2016 15:36:25 -0700 Subject: include: nvgpu: change alloc_gpfifo ioctl # This moves the newly added ioctl, NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO_EX, to the end of the ioctl list. This ensures that nvrm_gpu can correctly determine whether the kernel has this IOCTL. Bug 1795076 Change-Id: Ic42d88142809e71b5d7a4328388338c937252b8b Signed-off-by: Sachit Kadle Reviewed-on: http://git-master/r/1242442 GVS: Gerrit_Virtual_Submit Reviewed-by: David Martinez Nieto Reviewed-by: Terje Bergstrom --- include/uapi/linux/nvgpu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h index 5110ee79..d12ba772 100644 --- a/include/uapi/linux/nvgpu.h +++ b/include/uapi/linux/nvgpu.h @@ -1190,8 +1190,6 @@ struct nvgpu_preemption_mode_args { _IOWR(NVGPU_IOCTL_MAGIC, 18, struct nvgpu_set_timeout_ex_args) #define NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO \ _IOW(NVGPU_IOCTL_MAGIC, 100, struct nvgpu_alloc_gpfifo_args) -#define NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO_EX \ - _IOW(NVGPU_IOCTL_MAGIC, 101, struct nvgpu_alloc_gpfifo_ex_args) #define NVGPU_IOCTL_CHANNEL_WAIT \ _IOWR(NVGPU_IOCTL_MAGIC, 102, struct nvgpu_wait_args) #define NVGPU_IOCTL_CHANNEL_CYCLE_STATS \ @@ -1228,9 +1226,11 @@ struct nvgpu_preemption_mode_args { _IOW(NVGPU_IOCTL_MAGIC, 121, struct nvgpu_timeslice_args) #define NVGPU_IOCTL_CHANNEL_SET_PREEMPTION_MODE \ _IOW(NVGPU_IOCTL_MAGIC, 122, struct nvgpu_preemption_mode_args) +#define NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO_EX \ + _IOW(NVGPU_IOCTL_MAGIC, 123, struct nvgpu_alloc_gpfifo_ex_args) #define NVGPU_IOCTL_CHANNEL_LAST \ - _IOC_NR(NVGPU_IOCTL_CHANNEL_SET_PREEMPTION_MODE) + _IOC_NR(NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO_EX) #define NVGPU_IOCTL_CHANNEL_MAX_ARG_SIZE sizeof(struct nvgpu_alloc_gpfifo_ex_args) /* -- cgit v1.2.2