summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
diff options
context:
space:
mode:
authorKonsta Holtta <kholtta@nvidia.com>2017-03-28 03:22:12 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-03-28 12:39:13 -0400
commit580c8112f08281332cefea16243fcfbf27cd6bdd (patch)
treed3d5769c61f345ee5a537938c99c5ec5234b18ba /drivers/gpu/nvgpu/gk20a/channel_gk20a.c
parentd066a6fa3cdcff1d767822afb79bc6148add0e24 (diff)
gpu: nvgpu: avoid false job timeout message
The nvgpu timer API prints a message when the timer expires, but expiration of that does not necessarily mean here that the job has actually timed out, which is tested by comparing gp_get. Change the expiration check to just peek instead of the default which prints to log on expiration. Bug 1887569 Jira NVGPU-21 Change-Id: Ifde34cff701eaed2f3ea727dba3ec8affeef26b9 Signed-off-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-on: http://git-master/r/1329731 Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index d0d38f83..8e0d3407 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -2260,7 +2260,7 @@ static void gk20a_channel_timeout_check(struct channel_gk20a *ch)
2260 2260
2261 nvgpu_raw_spinlock_acquire(&ch->timeout.lock); 2261 nvgpu_raw_spinlock_acquire(&ch->timeout.lock);
2262 timed_out = ch->timeout.running && 2262 timed_out = ch->timeout.running &&
2263 nvgpu_timeout_expired(&ch->timeout.timer); 2263 nvgpu_timeout_peek_expired(&ch->timeout.timer);
2264 nvgpu_raw_spinlock_release(&ch->timeout.lock); 2264 nvgpu_raw_spinlock_release(&ch->timeout.lock);
2265 2265
2266 if (timed_out) 2266 if (timed_out)