drm/amdgpu: add ring soft recovery v4

Instead of hammering hard on the GPU try a soft recovery first.

v2: reorder code a bit
v3: increase timeout to 10ms, increment GPU reset counter
v4: squash in compile fix (Christian)

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index facc0f08d804..34e54d41f5ca 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -33,6 +33,12 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)
         struct amdgpu_ring *ring = to_amdgpu_ring(s_job->sched);
         struct amdgpu_job *job = to_amdgpu_job(s_job);
 
+        if (amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) {
+                DRM_ERROR("ring %s timeout, but soft recovered\n",
+                          s_job->sched->name);
+                return;
+        }
+
         DRM_ERROR("ring %s timeout, signaled seq=%u, emitted seq=%u\n",
                   job->base.sched->name, atomic_read(&ring->fence_drv.last_seq),
                   ring->fence_drv.sync_seq);