leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/sched: make sure timer is restarted

Browse Source 
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>
This commit is contained in:
Christian König 2018-10-12 16:32:40 +02:00 committed by Alex Deucher
parent 548f2ecc33
commit 19067e522d
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/etnaviv/etnaviv_sched.c
View File

@ -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;
}

1
drivers/gpu/drm/scheduler/sched_main.c
View File

@ -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);
}

3
drivers/gpu/drm/v3d/v3d_sched.c
View File

@ -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;
}