diff options
| author | Christian König <christian.koenig@amd.com> | 2018-10-12 16:32:40 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-11-05 14:21:01 -0500 |
| commit | 19067e522d99fb869ba17420d6ef235182cb420e (patch) | |
| tree | 1eee387ae6f29d5ba58d075a03e769d759ec5981 | |
| parent | 548f2ecc33b5a377d9d5ba9d69cc06722f7930e1 (diff) | |
| download | linux-stable-19067e522d99fb869ba17420d6ef235182cb420e.tar.gz linux-stable-19067e522d99fb869ba17420d6ef235182cb420e.tar.bz2 linux-stable-19067e522d99fb869ba17420d6ef235182cb420e.zip | |
drm/sched: make sure timer is restarted
Make sure we always restart the timer after a timeout and remove the
device specific workarounds.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/scheduler/sched_main.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/v3d/v3d_sched.c | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c index e7c3ed6c9a2e..f8c5f1e6c5e2 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c @@ -105,8 +105,6 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job) change = dma_addr - gpu->hangcheck_dma_addr; if (change < 0 || change > 16) { gpu->hangcheck_dma_addr = dma_addr; - schedule_delayed_work(&sched_job->sched->work_tdr, - sched_job->sched->timeout); return; } diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 44fe587aaef9..73449c653b6e 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -283,6 +283,7 @@ static void drm_sched_job_timedout(struct work_struct *work) already_signaled: ; } + drm_sched_start_timeout(sched); spin_unlock(&sched->job_list_lock); } diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c index 9243dea6e6ad..80b641ffc3be 100644 --- a/drivers/gpu/drm/v3d/v3d_sched.c +++ b/drivers/gpu/drm/v3d/v3d_sched.c @@ -167,9 +167,6 @@ v3d_job_timedout(struct drm_sched_job *sched_job) if (job->timedout_ctca != ctca || job->timedout_ctra != ctra) { job->timedout_ctca = ctca; job->timedout_ctra = ctra; - - schedule_delayed_work(&job->base.sched->work_tdr, - job->base.sched->timeout); return; } |