From 580c8112f08281332cefea16243fcfbf27cd6bdd Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Tue, 28 Mar 2017 10:22:12 +0300 Subject: 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 Reviewed-on: http://git-master/r/1329731 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu') 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) nvgpu_raw_spinlock_acquire(&ch->timeout.lock); timed_out = ch->timeout.running && - nvgpu_timeout_expired(&ch->timeout.timer); + nvgpu_timeout_peek_expired(&ch->timeout.timer); nvgpu_raw_spinlock_release(&ch->timeout.lock); if (timed_out) -- cgit v1.2.2