From 15d1c5375e4c0e99846b18abf90ff0b82c9fb1ab Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Fri, 10 Jun 2016 16:27:47 -0700 Subject: gpu: nvgpu: disable semaphore acquire timeout when channel wdt is disabled CUDA needs it disabled. Bug 1775453 Change-Id: Ic6d5050f9fda259337668e2a245c05e27d65e047 Signed-off-by: Richard Zhao Reviewed-on: http://git-master/r/1162765 (cherry picked from commit 44b48d84e75ced2fd9eecebbe94a0289c527c0c2) Reviewed-on: http://git-master/r/1169049 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 5b007f33..91e025e1 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c @@ -216,7 +216,7 @@ u32 channel_gk20a_pbdma_acquire_val(struct channel_gk20a *c) val = pbdma_acquire_retry_man_2_f() | pbdma_acquire_retry_exp_2_f(); - if (!c->g->timeouts_enabled) + if (!c->g->timeouts_enabled || !c->wdt_enabled) return val; timeout = gk20a_get_channel_watchdog_timeout(c); -- cgit v1.2.2