drm/amdgpu/sdma7: implement queue reset callback for sdma7

Implement sdma queue reset callback by mes_reset_queue_mmio.

Signed-off-by: Jesse Zhang <jesse.zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
index eb17f6968bccc3488a7b9c77274f0639fea6d01f..c85f7626896a77423ed5016a0288ba7183e3d283 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
@@ -829,6 +829,31 @@ static bool sdma_v7_0_check_soft_reset(struct amdgpu_ip_block *ip_block)
        return false;
 }
 
+static int sdma_v7_0_reset_queue(struct amdgpu_ring *ring, unsigned int vmid)
+{
+       struct amdgpu_device *adev = ring->adev;
+       int i, r;
+
+       if (amdgpu_sriov_vf(adev))
+               return -EINVAL;
+
+       for (i = 0; i < adev->sdma.num_instances; i++) {
+               if (ring == &adev->sdma.instance[i].ring)
+                       break;
+       }
+
+       if (i == adev->sdma.num_instances) {
+               DRM_ERROR("sdma instance not found\n");
+               return -EINVAL;
+       }
+
+       r = amdgpu_mes_reset_legacy_queue(adev, ring, vmid, true);
+       if (r)
+               return r;
+
+       return sdma_v7_0_gfx_resume_instance(adev, i, true);
+}
+
 /**
  * sdma_v7_0_start - setup and start the async dma engines
  *
@@ -1659,6 +1684,7 @@ static const struct amdgpu_ring_funcs sdma_v7_0_ring_funcs = {
        .emit_reg_write_reg_wait = sdma_v7_0_ring_emit_reg_write_reg_wait,
        .init_cond_exec = sdma_v7_0_ring_init_cond_exec,
        .preempt_ib = sdma_v7_0_ring_preempt_ib,
+       .reset = sdma_v7_0_reset_queue,
 };
 
 static void sdma_v7_0_set_ring_funcs(struct amdgpu_device *adev)