[PATCH 10/28] drm/amdgpu/sdma5.2: re-emit unprocessed state on ring reset

[Alex Deucher]

Re-emit the unprocessed state after resetting the queue.

Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c 
b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index 6843c2c3d71f5..5547d0d948672 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -1457,14 +1457,25 @@ static int sdma_v5_2_reset_queue(struct amdgpu_ring 
*ring,
                                 struct amdgpu_fence *timedout_fence)
 {
        struct amdgpu_device *adev = ring->adev;
-       u32 inst_id = ring->me;
        int r;
 
+       if (amdgpu_sriov_vf(adev))
+               return -EINVAL;
+
+       if (ring->me >= adev->sdma.num_instances) {
+               DRM_ERROR("sdma instance not found\n");
+               return -EINVAL;
+       }
+
+       amdgpu_ring_reset_helper_begin(ring, timedout_fence);
+
        amdgpu_amdkfd_suspend(adev, true);
-       r = amdgpu_sdma_reset_engine(adev, inst_id, false);
+       r = amdgpu_sdma_reset_engine(adev, ring->me, true);
        amdgpu_amdkfd_resume(adev, true);
+       if (r)
+               return r;
 
-       return r;
+       return amdgpu_ring_reset_helper_end(ring, timedout_fence);
 }
 
 static int sdma_v5_2_stop_queue(struct amdgpu_ring *ring)
-- 
2.50.0