diff options
author | Sachit Kadle <skadle@nvidia.com> | 2016-10-25 18:36:25 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-10-27 00:14:28 -0400 |
commit | bc9df802feaeff0b1d7d1a2fc964267ebd10058d (patch) | |
tree | aa63742ad5f39a8111c27531e2c640fa69844d4f /include/uapi/linux/nvgpu.h | |
parent | d539e9741505581357f611e4d5fef21abfd08484 (diff) |
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 <skadle@nvidia.com>
Reviewed-on: http://git-master/r/1242442
GVS: Gerrit_Virtual_Submit
Reviewed-by: David Martinez Nieto <dmartineznie@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'include/uapi/linux/nvgpu.h')
-rw-r--r-- | include/uapi/linux/nvgpu.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 { | |||
1190 | _IOWR(NVGPU_IOCTL_MAGIC, 18, struct nvgpu_set_timeout_ex_args) | 1190 | _IOWR(NVGPU_IOCTL_MAGIC, 18, struct nvgpu_set_timeout_ex_args) |
1191 | #define NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO \ | 1191 | #define NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO \ |
1192 | _IOW(NVGPU_IOCTL_MAGIC, 100, struct nvgpu_alloc_gpfifo_args) | 1192 | _IOW(NVGPU_IOCTL_MAGIC, 100, struct nvgpu_alloc_gpfifo_args) |
1193 | #define NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO_EX \ | ||
1194 | _IOW(NVGPU_IOCTL_MAGIC, 101, struct nvgpu_alloc_gpfifo_ex_args) | ||
1195 | #define NVGPU_IOCTL_CHANNEL_WAIT \ | 1193 | #define NVGPU_IOCTL_CHANNEL_WAIT \ |
1196 | _IOWR(NVGPU_IOCTL_MAGIC, 102, struct nvgpu_wait_args) | 1194 | _IOWR(NVGPU_IOCTL_MAGIC, 102, struct nvgpu_wait_args) |
1197 | #define NVGPU_IOCTL_CHANNEL_CYCLE_STATS \ | 1195 | #define NVGPU_IOCTL_CHANNEL_CYCLE_STATS \ |
@@ -1228,9 +1226,11 @@ struct nvgpu_preemption_mode_args { | |||
1228 | _IOW(NVGPU_IOCTL_MAGIC, 121, struct nvgpu_timeslice_args) | 1226 | _IOW(NVGPU_IOCTL_MAGIC, 121, struct nvgpu_timeslice_args) |
1229 | #define NVGPU_IOCTL_CHANNEL_SET_PREEMPTION_MODE \ | 1227 | #define NVGPU_IOCTL_CHANNEL_SET_PREEMPTION_MODE \ |
1230 | _IOW(NVGPU_IOCTL_MAGIC, 122, struct nvgpu_preemption_mode_args) | 1228 | _IOW(NVGPU_IOCTL_MAGIC, 122, struct nvgpu_preemption_mode_args) |
1229 | #define NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO_EX \ | ||
1230 | _IOW(NVGPU_IOCTL_MAGIC, 123, struct nvgpu_alloc_gpfifo_ex_args) | ||
1231 | 1231 | ||
1232 | #define NVGPU_IOCTL_CHANNEL_LAST \ | 1232 | #define NVGPU_IOCTL_CHANNEL_LAST \ |
1233 | _IOC_NR(NVGPU_IOCTL_CHANNEL_SET_PREEMPTION_MODE) | 1233 | _IOC_NR(NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO_EX) |
1234 | #define NVGPU_IOCTL_CHANNEL_MAX_ARG_SIZE sizeof(struct nvgpu_alloc_gpfifo_ex_args) | 1234 | #define NVGPU_IOCTL_CHANNEL_MAX_ARG_SIZE sizeof(struct nvgpu_alloc_gpfifo_ex_args) |
1235 | 1235 | ||
1236 | /* | 1236 | /* |