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
Bug 200291842
Jira NVGPU-21

Change-Id: Ifde34cff701eaed2f3ea727dba3ec8affeef26b9
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1329731
(cherry picked from commit 580c8112f0)
Reviewed-on: http://git-master/r/1452969
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Konsta Holtta
2017-03-28 10:22:12 +03:00
committed by mobile promotions
parent 9eef737acf
commit 873e1b81bf

View File

@@ -2265,7 +2265,7 @@ static void gk20a_channel_timeout_check(struct channel_gk20a *ch)
nvgpu_raw_spinlock_acquire(&ch->timeout.lock); nvgpu_raw_spinlock_acquire(&ch->timeout.lock);
timed_out = ch->timeout.running && 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); nvgpu_raw_spinlock_release(&ch->timeout.lock);
if (timed_out) if (timed_out)