[PATCH 10/16] drm/amdgpu/gfx11: re-emit unprocessed state on kgq 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_v11_0.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 39374c87738b3..218bd4d77e859 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -6818,6 +6818,7 @@ static int gfx_v11_reset_gfx_pipe(struct amdgpu_ring 
*ring)
 static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring, unsigned int vmid)
 {
        struct amdgpu_device *adev = ring->adev;
+       unsigned int i;
        int r;
 
        if (amdgpu_sriov_vf(adev))
@@ -6844,7 +6845,21 @@ static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring, 
unsigned int vmid)
                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;
 }
 
 static int gfx_v11_0_reset_compute_pipe(struct amdgpu_ring *ring)
@@ -7240,7 +7255,6 @@ static const struct amdgpu_ring_funcs 
gfx_v11_0_ring_funcs_gfx = {
        .emit_wreg = gfx_v11_0_ring_emit_wreg,
        .emit_reg_wait = gfx_v11_0_ring_emit_reg_wait,
        .emit_reg_write_reg_wait = gfx_v11_0_ring_emit_reg_write_reg_wait,
-       .soft_recovery = gfx_v11_0_ring_soft_recovery,
        .emit_mem_sync = gfx_v11_0_emit_mem_sync,
        .reset = gfx_v11_0_reset_kgq,
        .emit_cleaner_shader = gfx_v11_0_ring_emit_cleaner_shader,
-- 
2.49.0