nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 09:57:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: disable semaphore acquire timeout when channel wdt is disabled

Browse Source 
CUDA needs it disabled.

Bug 1775453

Change-Id: Ic6d5050f9fda259337668e2a245c05e27d65e047
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/1162765
(cherry picked from commit 44b48d84e75ced2fd9eecebbe94a0289c527c0c2)
Reviewed-on: http://git-master/r/1169049
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Richard Zhao
2016-06-10 16:27:47 -07:00
committed by Terje Bergstrom
parent 7c69a5cd03
commit 15d1c5375e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/gk20a/channel_gk20a.c
View File

@@ -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);