[PATCH 21/29] drm/amdgpu/jpeg4: 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/jpeg_v4_0.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c 
b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
index 179dd420edb15..8d7371121d28c 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
@@ -728,14 +728,22 @@ static int jpeg_v4_0_ring_reset(struct amdgpu_ring *ring,
        if (amdgpu_sriov_vf(ring->adev))
                return -EINVAL;
 
+       amdgpu_ring_backup_unprocessed_commands(ring, &job->hw_fence.base, 
true);
        jpeg_v4_0_stop(ring->adev);
        jpeg_v4_0_start(ring->adev);
-       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