[PATCH 27/29] drm/amdgpu/vcn4.0.3: 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/vcn_v4_0_3.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c 
b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
index a9d8ae4ab109a..e3fd5291b5195 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
@@ -1608,6 +1608,8 @@ static int vcn_v4_0_3_ring_reset(struct amdgpu_ring *ring,
        if (!(adev->vcn.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
                return -EOPNOTSUPP;
 
+       amdgpu_ring_backup_unprocessed_commands(ring, &job->hw_fence.base, 
true);
+
        vcn_inst = GET_INST(VCN, ring->me);
        r = amdgpu_dpm_reset_vcn(adev, 1 << vcn_inst);
 
@@ -1621,12 +1623,19 @@ static int vcn_v4_0_3_ring_reset(struct amdgpu_ring 
*ring,
                adev->vcn.caps |= AMDGPU_VCN_CAPS(RRMT_ENABLED);
        vcn_v4_0_3_hw_init_inst(vinst);
        vcn_v4_0_3_start_dpg_mode(vinst, 
adev->vcn.inst[ring->me].indirect_sram);
-       r = amdgpu_ring_test_helper(ring);
+       r = amdgpu_ring_test_ring(ring);
        if (r)
                return r;
+
        dma_fence_set_error(&job->base.s_fence->finished, -ETIME);
-       amdgpu_fence_driver_force_completion(ring);
+       /* signal the fence of the bad job */
+       amdgpu_fence_driver_guilty_force_completion(&job->hw_fence.base);
        atomic_inc(&ring->adev->gpu_reset_counter);
+       r = amdgpu_ring_reemit_unprocessed_commands(ring);
+       if (r)
+               /* if we fail to reemit, force complete all fences */
+               amdgpu_fence_driver_force_completion(ring);
+
        return 0;
 }
 
-- 
2.49.0