diff options
| author | Thomas Fleury <tfleury@nvidia.com> | 2016-10-26 12:30:49 -0400 |
|---|---|---|
| committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-12-09 23:24:08 -0500 |
| commit | e77256a1871feac1bf6e101c8fbe6e6d2eb21d12 (patch) | |
| tree | 0923f8aef182178f996b117167304052d4b4bfb6 /include/uapi/linux/nvgpu.h | |
| parent | dfb061cbdbc0a87391e475b5d86303cb028eb549 (diff) | |
gpu: nvgpu: renumber power and temperature ioctls
One ioctl number collided with NVGPU_GPU_IOCTL_GET_MEMORY_STATE.
Jira DNVGPU-166
Change-Id: Ib83fec2c0c4e3bc4ee3053005a8559bc15bdb33b
Signed-off-by: David Nieto <dmartineznie@nvidia.com>
Reviewed-on: http://git-master/r/1243115
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1267155
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'include/uapi/linux/nvgpu.h')
| -rw-r--r-- | include/uapi/linux/nvgpu.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h index f45be911..16aa51b2 100644 --- a/include/uapi/linux/nvgpu.h +++ b/include/uapi/linux/nvgpu.h | |||
| @@ -818,13 +818,13 @@ struct nvgpu_gpu_get_temperature_args { | |||
| 818 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 33, \ | 818 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 33, \ |
| 819 | struct nvgpu_gpu_get_memory_state_args) | 819 | struct nvgpu_gpu_get_memory_state_args) |
| 820 | #define NVGPU_GPU_IOCTL_GET_VOLTAGE \ | 820 | #define NVGPU_GPU_IOCTL_GET_VOLTAGE \ |
| 821 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 33, struct nvgpu_gpu_get_voltage_args) | 821 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 34, struct nvgpu_gpu_get_voltage_args) |
| 822 | #define NVGPU_GPU_IOCTL_GET_CURRENT \ | 822 | #define NVGPU_GPU_IOCTL_GET_CURRENT \ |
| 823 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 34, struct nvgpu_gpu_get_current_args) | 823 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 35, struct nvgpu_gpu_get_current_args) |
| 824 | #define NVGPU_GPU_IOCTL_GET_POWER \ | 824 | #define NVGPU_GPU_IOCTL_GET_POWER \ |
| 825 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 35, struct nvgpu_gpu_get_power_args) | 825 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 36, struct nvgpu_gpu_get_power_args) |
| 826 | #define NVGPU_GPU_IOCTL_GET_TEMPERATURE \ | 826 | #define NVGPU_GPU_IOCTL_GET_TEMPERATURE \ |
| 827 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 36, struct nvgpu_gpu_get_temperature_args) | 827 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 37, struct nvgpu_gpu_get_temperature_args) |
| 828 | #define NVGPU_GPU_IOCTL_GET_FBP_L2_MASKS \ | 828 | #define NVGPU_GPU_IOCTL_GET_FBP_L2_MASKS \ |
| 829 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 38, struct nvgpu_gpu_get_fbp_l2_masks_args) | 829 | _IOWR(NVGPU_GPU_IOCTL_MAGIC, 38, struct nvgpu_gpu_get_fbp_l2_masks_args) |
| 830 | #define NVGPU_GPU_IOCTL_LAST \ | 830 | #define NVGPU_GPU_IOCTL_LAST \ |