summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-08-16 19:52:35 +0200
committerAlex Deucher <alexander.deucher@amd.com>2016-08-19 12:29:20 -0400
commitbdf001374bfe12677ae6ec5076452493fb682012 (patch)
tree5da429580d2b23347834cea13b1d1e2d85239196
parent847927bb3db2b18744ddec1b4fbb274ac7e05199 (diff)
downloadop-kernel-dev-bdf001374bfe12677ae6ec5076452493fb682012.zip
op-kernel-dev-bdf001374bfe12677ae6ec5076452493fb682012.tar.gz
drm/amdgpu: fix timeout value check in amd_sched_job_recovery
Could be that we don't actually have a timeout set. Signed-off-by: Christian König <christian.koenig@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/scheduler/gpu_scheduler.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index ef312bb..963a24d 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -405,7 +405,7 @@ void amd_sched_job_recovery(struct amd_gpu_scheduler *sched)
spin_lock(&sched->job_list_lock);
s_job = list_first_entry_or_null(&sched->ring_mirror_list,
struct amd_sched_job, node);
- if (s_job)
+ if (s_job && sched->timeout != MAX_SCHEDULE_TIMEOUT)
schedule_delayed_work(&s_job->work_tdr, sched->timeout);
list_for_each_entry_safe(s_job, tmp, &sched->ring_mirror_list, node) {
OpenPOWER on IntegriCloud