summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-01-11 13:55:30 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-01-26 15:52:55 -0500
commite52c6ac1f2a8abfd51f933598b6368711c42a9fa (patch)
tree296ae2a6fdc7c430fdbfc9cd234bdf5151b68a83 /drivers
parenta2d7dfdfb46d8beeedfd06f780644233c38e8153 (diff)
gpu: nvgpu: Bump semaphore timeout
Semaphore acquire timeout is configured to half of watchdog timeout. This is too short, so bump it to 80% of watchdog timeout. Bug 200261389 Change-Id: Ie906ea3d3520c2e3f547cff7ffbb1e37459e6d2f Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1283623 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 793c97c3..1ee9b59a 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -247,7 +247,8 @@ u32 channel_gk20a_pbdma_acquire_val(struct channel_gk20a *c)
247 return val; 247 return val;
248 248
249 timeout = gk20a_get_channel_watchdog_timeout(c); 249 timeout = gk20a_get_channel_watchdog_timeout(c);
250 do_div(timeout, 2); /* set acquire timeout to half of channel wdt */ 250 timeout *= 80UL;
251 do_div(timeout, 100); /* set acquire timeout to 80% of channel wdt */
251 timeout *= 1000000UL; /* ms -> ns */ 252 timeout *= 1000000UL; /* ms -> ns */
252 do_div(timeout, 1024); /* in unit of 1024ns */ 253 do_div(timeout, 1024); /* in unit of 1024ns */
253 val_len = fls(timeout >> 32) + 32; 254 val_len = fls(timeout >> 32) + 32;