[PATCH 13/16] drm/amdgpu/gfx9.4.3: re-emit unprocessed state on kcq 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/gfx_v9_4_3.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
index c233edf605694..7724689c4467e 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
@@ -3558,6 +3558,7 @@ static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring *ring,
        struct amdgpu_kiq *kiq = &adev->gfx.kiq[ring->xcc_id];
        struct amdgpu_ring *kiq_ring = &kiq->ring;
        unsigned long flags;
+       unsigned int i;
        int r;
 
        if (amdgpu_sriov_vf(adev))
@@ -3612,14 +3613,28 @@ static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring 
*ring,
        }
        kiq->pmf->kiq_map_queues(kiq_ring, ring);
        amdgpu_ring_commit(kiq_ring);
-       spin_unlock_irqrestore(&kiq->ring_lock, flags);
-
        r = amdgpu_ring_test_ring(kiq_ring);
+       spin_unlock_irqrestore(&kiq->ring_lock, flags);
        if (r) {
                dev_err(adev->dev, "fail to remap queue\n");
                return r;
        }
-       return amdgpu_ring_test_ring(ring);
+
+       if (amdgpu_ring_alloc(ring, 8))
+               return -ENOMEM;
+       amdgpu_ring_emit_fence(ring, ring->fence_drv.gpu_addr,
+                              ring->ring_backup_seq, 0);
+       amdgpu_ring_commit(ring);
+       r = amdgpu_ring_test_ring(ring);
+       if (r)
+               return r;
+       if (amdgpu_ring_alloc(ring, ring->ring_backup_entries_to_copy))
+               return -ENOMEM;
+       for (i = 0; i < ring->ring_backup_entries_to_copy; i++)
+               amdgpu_ring_write(ring, ring->ring_backup[i]);
+       amdgpu_ring_commit(ring);
+
+       return r;
 }
 
 enum amdgpu_gfx_cp_ras_mem_id {
-- 
2.49.0