drm/sched: Refactor ring mirror list handling.

Decauple sched threads stop and start and ring mirror
list handling from the policy of what to do about the
guilty jobs.
When stoppping the sched thread and detaching sched fences
from non signaled HW fenes wait for all signaled HW fences
to complete before rerunning the jobs.

v2: Fix resubmission of guilty job into HW after refactoring.

v4:
Full restart for all the jobs, not only from guilty ring.
Extract karma increase into standalone function.

v5:
Rework waiting for signaled jobs without relying on the job
struct itself as those might already be freed for non 'guilty'
job's schedulers.
Expose karma increase to drivers.

v6:
Use list_for_each_entry_safe_continue and drm_sched_process_job
in case fence already signaled.
Call drm_sched_increase_karma only once for amdgpu and add documentation.

v7:
Wait only for the latest job's fence.

Suggested-by: Christian Koenig <Christian.Koenig@amd.com>
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 7 insertions, 13 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index e20dce438d37..d7dddb936f84 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3313,17 +3313,15 @@ static int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev,
                 if (!ring || !ring->sched.thread)
                         continue;
 
-                kthread_park(ring->sched.thread);
-
-                if (job && job->base.sched != &ring->sched)
-                        continue;
-
-                drm_sched_hw_job_reset(&ring->sched, job ? &job->base : NULL);
+                drm_sched_stop(&ring->sched);
 
                 /* after all hw jobs are reset, hw fence is meaningless, so force_completion */
                 amdgpu_fence_driver_force_completion(ring);
         }
 
+        if(job)
+                drm_sched_increase_karma(&job->base);
+
 
 
         if (!amdgpu_sriov_vf(adev)) {
@@ -3469,14 +3467,10 @@ static void amdgpu_device_post_asic_reset(struct amdgpu_device *adev,
                 if (!ring || !ring->sched.thread)
                         continue;
 
-                /* only need recovery sched of the given job's ring
-                 * or all rings (in the case @job is NULL)
-                 * after above amdgpu_reset accomplished
-                 */
-                if ((!job || job->base.sched == &ring->sched) && !adev->asic_reset_res)
-                        drm_sched_job_recovery(&ring->sched);
+                if (!adev->asic_reset_res)
+                        drm_sched_resubmit_jobs(&ring->sched);
 
-                kthread_unpark(ring->sched.thread);
+                drm_sched_start(&ring->sched, !adev->asic_reset_res);
         }
 
         if (!amdgpu_device_has_dc_support(adev)) {