[PATCH v2 3/7] drm/amdgpu: Add ring reset callback for JPEG4_0_0

[Sathishkumar S]

Add ring reset function callback for JPEG4_0_0 to
recover from job timeouts without a full gpu reset.

Signed-off-by: Sathishkumar S <sathishkumar.sundarar...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c 
b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
index b0666090f52c..7b6c7aa36ff5 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
@@ -143,14 +143,10 @@ static int jpeg_v4_0_sw_init(struct amdgpu_ip_block 
*ip_block)
        if (r)
                return r;
 
-       /* TODO: Add queue reset mask when FW fully supports it */
-       adev->jpeg.supported_reset =
-               
amdgpu_get_soft_full_reset_mask(&adev->jpeg.inst[0].ring_dec[0]);
+       adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;
        r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
-       if (r)
-               return r;
 
-       return 0;
+       return r;
 }
 
 /**
@@ -724,6 +720,20 @@ static int jpeg_v4_0_process_interrupt(struct 
amdgpu_device *adev,
        return 0;
 }
 
+static int jpeg_v4_0_ring_reset(struct amdgpu_ring *ring, unsigned int vmid)
+{
+       struct amdgpu_device *adev = ring->adev;
+       int ret;
+
+       if (amdgpu_sriov_vf(adev))
+               return -EINVAL;
+
+       jpeg_v4_0_stop(ring->adev);
+       jpeg_v4_0_start(ring->adev);
+       ret = amdgpu_ring_test_helper(ring);
+       return ret;
+}
+
 static const struct amd_ip_funcs jpeg_v4_0_ip_funcs = {
        .name = "jpeg_v4_0",
        .early_init = jpeg_v4_0_early_init,
@@ -769,6 +779,7 @@ static const struct amdgpu_ring_funcs 
jpeg_v4_0_dec_ring_vm_funcs = {
        .emit_wreg = jpeg_v2_0_dec_ring_emit_wreg,
        .emit_reg_wait = jpeg_v2_0_dec_ring_emit_reg_wait,
        .emit_reg_write_reg_wait = amdgpu_ring_emit_reg_write_reg_wait_helper,
+       .reset = jpeg_v4_0_ring_reset,
 };
 
 static void jpeg_v4_0_set_dec_ring_funcs(struct amdgpu_device *adev)
-- 
2.25.1