summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmad Mir <emir@nvidia.com>2018-09-10 18:37:03 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-10 19:03:16 -0400
commitc615002d22b4675d08404eb7cc7087d4418eccdb (patch)
tree13a677b72ca79a35b076ef345e0c1596f12a0cdb
parentc4ba8ee209835e6d1b95a07856805e090b72e981 (diff)
Revert "gpu: nvgpu: deny any request less than engine timeout"
This reverts commit 4f01d6a9b9a54cf6042db157de0d40965077f6a2. Change-Id: I604acef2a1f322a521df3ceb39e7df5d249a5716 Reviewed-on: https://git-master.nvidia.com/r/1818387 Reviewed-by: Emad Mir <emir@nvidia.com> Tested-by: Emad Mir <emir@nvidia.com> Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/os/linux/ioctl_channel.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
index b48cfa99..e9a24923 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
@@ -1227,11 +1227,6 @@ long gk20a_channel_ioctl(struct file *filp,
1227 (u32)((struct nvgpu_set_timeout_args *)buf)->timeout; 1227 (u32)((struct nvgpu_set_timeout_args *)buf)->timeout;
1228 nvgpu_log(g, gpu_dbg_gpu_dbg, "setting timeout (%d ms) for chid %d", 1228 nvgpu_log(g, gpu_dbg_gpu_dbg, "setting timeout (%d ms) for chid %d",
1229 timeout, ch->chid); 1229 timeout, ch->chid);
1230 if (timeout < g->fifo_eng_timeout_us / 1000) {
1231 dump_stack();
1232 err = -EINVAL;
1233 break;
1234 }
1235 ch->timeout_ms_max = timeout; 1230 ch->timeout_ms_max = timeout;
1236 gk20a_channel_trace_sched_param( 1231 gk20a_channel_trace_sched_param(
1237 trace_gk20a_channel_set_timeout, ch); 1232 trace_gk20a_channel_set_timeout, ch);
@@ -1246,11 +1241,6 @@ long gk20a_channel_ioctl(struct file *filp,
1246 (1 << NVGPU_TIMEOUT_FLAG_DISABLE_DUMP)); 1241 (1 << NVGPU_TIMEOUT_FLAG_DISABLE_DUMP));
1247 nvgpu_log(g, gpu_dbg_gpu_dbg, "setting timeout (%d ms) for chid %d", 1242 nvgpu_log(g, gpu_dbg_gpu_dbg, "setting timeout (%d ms) for chid %d",
1248 timeout, ch->chid); 1243 timeout, ch->chid);
1249 if (timeout < g->fifo_eng_timeout_us / 1000) {
1250 dump_stack();
1251 err = -EINVAL;
1252 break;
1253 }
1254 ch->timeout_ms_max = timeout; 1244 ch->timeout_ms_max = timeout;
1255 ch->timeout_debug_dump = timeout_debug_dump; 1245 ch->timeout_debug_dump = timeout_debug_dump;
1256 gk20a_channel_trace_sched_param( 1246 gk20a_channel_trace_sched_param(