From e77256a1871feac1bf6e101c8fbe6e6d2eb21d12 Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Wed, 26 Oct 2016 09:30:49 -0700 Subject: 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 Reviewed-on: http://git-master/r/1243115 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom Reviewed-on: http://git-master/r/1267155 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit --- include/uapi/linux/nvgpu.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/uapi/linux/nvgpu.h') 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 { _IOWR(NVGPU_GPU_IOCTL_MAGIC, 33, \ struct nvgpu_gpu_get_memory_state_args) #define NVGPU_GPU_IOCTL_GET_VOLTAGE \ - _IOWR(NVGPU_GPU_IOCTL_MAGIC, 33, struct nvgpu_gpu_get_voltage_args) + _IOWR(NVGPU_GPU_IOCTL_MAGIC, 34, struct nvgpu_gpu_get_voltage_args) #define NVGPU_GPU_IOCTL_GET_CURRENT \ - _IOWR(NVGPU_GPU_IOCTL_MAGIC, 34, struct nvgpu_gpu_get_current_args) + _IOWR(NVGPU_GPU_IOCTL_MAGIC, 35, struct nvgpu_gpu_get_current_args) #define NVGPU_GPU_IOCTL_GET_POWER \ - _IOWR(NVGPU_GPU_IOCTL_MAGIC, 35, struct nvgpu_gpu_get_power_args) + _IOWR(NVGPU_GPU_IOCTL_MAGIC, 36, struct nvgpu_gpu_get_power_args) #define NVGPU_GPU_IOCTL_GET_TEMPERATURE \ - _IOWR(NVGPU_GPU_IOCTL_MAGIC, 36, struct nvgpu_gpu_get_temperature_args) + _IOWR(NVGPU_GPU_IOCTL_MAGIC, 37, struct nvgpu_gpu_get_temperature_args) #define NVGPU_GPU_IOCTL_GET_FBP_L2_MASKS \ _IOWR(NVGPU_GPU_IOCTL_MAGIC, 38, struct nvgpu_gpu_get_fbp_l2_masks_args) #define NVGPU_GPU_IOCTL_LAST \ -- cgit v1.2.2