drm/amdgpu: Add ring reset callback for JPEG4_0_3

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

V2:
 - sched->ready flag shouldn't be modified by HW backend (Christian)

V3:
 - Dont modifying sched/job-submission state from HW backend (Christian)
 - Implement per-core reset sequence

V4:
 -  Dont create reset_mask sysfs and return -EOPNOTSUPP on VFs (Lijo)

Signed-off-by: Sathishkumar S <sathishkumar.sundararaju@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
index c67ba961de91a8be891ac466fce8d6905a192ffd..0588bb80f41e6ff2e426ad52dc3e7d0f83ef8a28 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
@@ -204,12 +204,12 @@ static int jpeg_v4_0_3_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]);
-       r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
-       if (r)
-               return r;
+       if (!amdgpu_sriov_vf(adev)) {
+               adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;
+               r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
+               if (r)
+                       return r;
+       }
 
        return 0;
 }
@@ -230,7 +230,9 @@ static int jpeg_v4_0_3_sw_fini(struct amdgpu_ip_block *ip_block)
        if (r)
                return r;
 
-       amdgpu_jpeg_sysfs_reset_mask_fini(adev);
+       if (!amdgpu_sriov_vf(adev))
+               amdgpu_jpeg_sysfs_reset_mask_fini(adev);
+
        r = amdgpu_jpeg_sw_fini(adev);
 
        return r;
@@ -1099,6 +1101,45 @@ static int jpeg_v4_0_3_process_interrupt(struct amdgpu_device *adev,
        return 0;
 }
 
+static void jpeg_v4_0_3_core_stall_reset(struct amdgpu_ring *ring)
+{
+       struct amdgpu_device *adev = ring->adev;
+       int jpeg_inst = GET_INST(JPEG, ring->me);
+       int reg_offset = jpeg_v4_0_3_core_reg_offset(ring->pipe);
+
+       WREG32_SOC15_OFFSET(JPEG, jpeg_inst,
+                           regUVD_JMI0_UVD_JMI_CLIENT_STALL,
+                           reg_offset, 0x1F);
+       SOC15_WAIT_ON_RREG(JPEG, jpeg_inst,
+                          regUVD_JMI0_UVD_JMI_CLIENT_CLEAN_STATUS,
+                          0x1F, 0x1F);
+       WREG32_SOC15_OFFSET(JPEG, jpeg_inst,
+                           regUVD_JMI0_JPEG_LMI_DROP,
+                           reg_offset, 0x1F);
+       WREG32_SOC15_OFFSET(JPEG, jpeg_inst,
+                           regJPEG_CORE_RST_CTRL,
+                           reg_offset, 1 << ring->pipe);
+       WREG32_SOC15_OFFSET(JPEG, jpeg_inst,
+                           regUVD_JMI0_UVD_JMI_CLIENT_STALL,
+                           reg_offset, 0x00);
+       WREG32_SOC15_OFFSET(JPEG, jpeg_inst,
+                           regUVD_JMI0_JPEG_LMI_DROP,
+                           reg_offset, 0x00);
+       WREG32_SOC15_OFFSET(JPEG, jpeg_inst,
+                           regJPEG_CORE_RST_CTRL,
+                           reg_offset, 0x00);
+}
+
+static int jpeg_v4_0_3_ring_reset(struct amdgpu_ring *ring, unsigned int vmid)
+{
+       if (amdgpu_sriov_vf(ring->adev))
+               return -EOPNOTSUPP;
+
+       jpeg_v4_0_3_core_stall_reset(ring);
+       jpeg_v4_0_3_start_jrbc(ring);
+       return amdgpu_ring_test_helper(ring);
+}
+
 static const struct amd_ip_funcs jpeg_v4_0_3_ip_funcs = {
        .name = "jpeg_v4_0_3",
        .early_init = jpeg_v4_0_3_early_init,
@@ -1145,6 +1186,7 @@ static const struct amdgpu_ring_funcs jpeg_v4_0_3_dec_ring_vm_funcs = {
        .emit_wreg = jpeg_v4_0_3_dec_ring_emit_wreg,
        .emit_reg_wait = jpeg_v4_0_3_dec_ring_emit_reg_wait,
        .emit_reg_write_reg_wait = amdgpu_ring_emit_reg_write_reg_wait_helper,
+       .reset = jpeg_v4_0_3_ring_reset,
 };
 
 static void jpeg_v4_0_3_set_dec_ring_funcs(struct amdgpu_device *adev)