drm/v3d: Fix calling drm_sched_resubmit_jobs for same sched.

Also stop calling drm_sched_increase_karma multiple times.

v2: Fix whitespace in the code we're moving (by anholt)

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/1552409822-17230-1-git-send-email-andrey.grodzovsky@amd.com
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Fixes: 222b5f044159 ("drm/sched: Refactor ring mirror list handling.")

diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c
index 4704b2df3688816b51f5dfadeda17c9c328e2731..d0c68b7c8b41d7c2af6d7fdfa78472b262b91d38 100644 (file)
--- a/drivers/gpu/drm/v3d/v3d_sched.c
+++ b/drivers/gpu/drm/v3d/v3d_sched.c
@@ -231,20 +231,17 @@ v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job)
        mutex_lock(&v3d->reset_lock);
 
        /* block scheduler */
-       for (q = 0; q < V3D_MAX_QUEUES; q++) {
-               struct drm_gpu_scheduler *sched = &v3d->queue[q].sched;
-
-               drm_sched_stop(sched);
+       for (q = 0; q < V3D_MAX_QUEUES; q++)
+               drm_sched_stop(&v3d->queue[q].sched);
 
-               if(sched_job)
-                       drm_sched_increase_karma(sched_job);
-       }
+       if (sched_job)
+               drm_sched_increase_karma(sched_job);
 
        /* get the GPU back into the init state */
        v3d_reset(v3d);
 
        for (q = 0; q < V3D_MAX_QUEUES; q++)
-               drm_sched_resubmit_jobs(sched_job->sched);
+               drm_sched_resubmit_jobs(&v3d->queue[q].sched);
 
        /* Unblock schedulers and restart their jobs. */
        for (q = 0; q < V3D_MAX_QUEUES; q++) {