[PATCH 15/31] drm/amdgpu/sdma4.4.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_v4_4_2.c | 32 ++++++++++++++++++------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c 
b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
index eb78bf04a490b..a744efd5c0354 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
@@ -1670,7 +1670,6 @@ static bool sdma_v4_4_2_page_ring_is_guilty(struct 
amdgpu_ring *ring)
 static int sdma_v4_4_2_reset_queue(struct amdgpu_ring *ring, unsigned int vmid)
 {
        struct amdgpu_device *adev = ring->adev;
-       bool is_guilty = ring->funcs->is_guilty(ring);
        u32 id = GET_INST(SDMA0, ring->me);
        int r;
 
@@ -1681,9 +1680,6 @@ static int sdma_v4_4_2_reset_queue(struct amdgpu_ring 
*ring, unsigned int vmid)
        r = amdgpu_sdma_reset_engine(adev, id);
        amdgpu_amdkfd_resume(adev, false);
 
-       if (is_guilty)
-               amdgpu_fence_driver_force_completion(ring);
-
        return r;
 }
 
@@ -1728,8 +1724,8 @@ static int sdma_v4_4_2_stop_queue(struct amdgpu_ring 
*ring)
 static int sdma_v4_4_2_restore_queue(struct amdgpu_ring *ring)
 {
        struct amdgpu_device *adev = ring->adev;
-       u32 inst_mask;
-       int i;
+       u32 inst_mask, tmp_mask;
+       int i, r;
 
        inst_mask = 1 << ring->me;
        udelay(50);
@@ -1746,7 +1742,29 @@ static int sdma_v4_4_2_restore_queue(struct amdgpu_ring 
*ring)
                return -ETIMEDOUT;
        }
 
-       return sdma_v4_4_2_inst_start(adev, inst_mask, true);
+       r = sdma_v4_4_2_inst_start(adev, inst_mask, true);
+       if (r) {
+               return r;
+       }
+
+       tmp_mask = inst_mask;
+       for_each_inst(i, tmp_mask) {
+               ring = &adev->sdma.instance[i].ring;
+
+               r = amdgpu_ring_reemit_unprocessed_jobs(ring);
+               if (r)
+                       return r;
+
+               if (adev->sdma.has_page_queue) {
+                       struct amdgpu_ring *page = &adev->sdma.instance[i].page;
+
+                       r = amdgpu_ring_reemit_unprocessed_jobs(page);
+                       if (r)
+                               return r;
+               }
+       }
+
+       return r;
 }
 
 static int sdma_v4_4_2_set_trap_irq_state(struct amdgpu_device *adev,
-- 
2.49.0