From c7e0c7e7ce045a9bef53f3fa11377ddb23bd79a3 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 13 Oct 2017 09:03:32 -0700 Subject: gpu: nvgpu: Move time correlation arg check to Linux Move code checking the time correlation IOCTL arguments to Linux IOCTL code. JIRA NVGPU-259 Change-Id: Id3ef6839ee96844104d87e943b6940b952261796 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1578700 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/bus.c | 5 ----- drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 3 ++- drivers/gpu/nvgpu/vgpu/vgpu.c | 5 ----- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/nvgpu/common/bus.c b/drivers/gpu/nvgpu/common/bus.c index c88262a0..a84348cd 100644 --- a/drivers/gpu/nvgpu/common/bus.c +++ b/drivers/gpu/nvgpu/common/bus.c @@ -31,11 +31,6 @@ int nvgpu_get_timestamps_zipper(struct gk20a *g, int err = 0; unsigned int i = 0; - if (source_id != NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_SRC_ID_TSC) { - nvgpu_err(g, "source_id %u not supported", source_id); - return -EINVAL; - } - if (gk20a_busy(g)) { nvgpu_err(g, "GPU not powered on\n"); err = -EINVAL; diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index 30988462..88c8debf 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c @@ -558,7 +558,8 @@ static int nvgpu_gpu_get_cpu_time_correlation_info( int err; u32 i; - if (args->count > NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_MAX_COUNT) + if (args->count > NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_MAX_COUNT || + args->source_id != NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_SRC_ID_TSC) return -EINVAL; samples = nvgpu_kzalloc(g, args->count * diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 7949ff24..84034b38 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c @@ -416,11 +416,6 @@ int vgpu_get_timestamps_zipper(struct gk20a *g, return -EINVAL; } - if (source_id != NVGPU_GPU_GET_CPU_TIME_CORRELATION_INFO_SRC_ID_TSC) { - nvgpu_err(g, "source_id %u not supported", source_id); - return -EINVAL; - } - msg.cmd = TEGRA_VGPU_CMD_GET_TIMESTAMPS_ZIPPER; msg.handle = vgpu_get_handle(g); p->source_id = TEGRA_VGPU_GET_TIMESTAMPS_ZIPPER_SRC_ID_TSC; -- cgit v1.2.2