drm/sched: Refactor ring mirror list handling.

[sfrench/cifs-2.6.git] / drivers / gpu / drm / etnaviv / etnaviv_sched.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
index 49a6763693f1ab372d4eeea89f72cd04bbf63442..67ae266020244dcd4cad74582920526c94a91aae 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
@@ -109,16 +109,19 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job)
        }
 
        /* block scheduler */
-       kthread_park(gpu->sched.thread);
-       drm_sched_hw_job_reset(&gpu->sched, sched_job);
+       drm_sched_stop(&gpu->sched);
+
+       if(sched_job)
+               drm_sched_increase_karma(sched_job);
 
        /* get the GPU back into the init state */
        etnaviv_core_dump(gpu);
        etnaviv_gpu_recover_hang(gpu);
 
+       drm_sched_resubmit_jobs(&gpu->sched);
+
        /* restart scheduler after GPU is usable again */
-       drm_sched_job_recovery(&gpu->sched);
-       kthread_unpark(gpu->sched.thread);
+       drm_sched_start(&gpu->sched, true);
 }
 
 static void etnaviv_sched_free_job(struct drm_sched_job *sched_job)