drm/amdgpu/gfx12: add ring reset callbacks

Add ring reset callbacks for gfx and compute.

Acked-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
index 6f700800f346bb121cb07191686834bc4c733634..335b5f01c6e809c2de56574e36e0e95f927eb13a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
@@ -5158,6 +5158,22 @@ static void gfx_v12_ip_dump(void *handle)
        amdgpu_gfx_off_ctrl(adev, true);
 }
 
+static int gfx_v12_0_reset_ring(struct amdgpu_ring *ring, unsigned int vmid)
+{
+       int r;
+
+       r = amdgpu_mes_reset_legacy_queue(ring->adev, ring, vmid);
+       if (r)
+               return r;
+
+       /* reset the ring */
+       ring->wptr = 0;
+       *ring->wptr_cpu_addr = 0;
+       amdgpu_ring_clear_ring(ring);
+
+       return amdgpu_ring_test_ring(ring);
+}
+
 static const struct amd_ip_funcs gfx_v12_0_ip_funcs = {
        .name = "gfx_v12_0",
        .early_init = gfx_v12_0_early_init,
@@ -5220,6 +5236,7 @@ static const struct amdgpu_ring_funcs gfx_v12_0_ring_funcs_gfx = {
        .emit_reg_write_reg_wait = gfx_v12_0_ring_emit_reg_write_reg_wait,
        .soft_recovery = gfx_v12_0_ring_soft_recovery,
        .emit_mem_sync = gfx_v12_0_emit_mem_sync,
+       .reset = gfx_v12_0_reset_ring,
 };
 
 static const struct amdgpu_ring_funcs gfx_v12_0_ring_funcs_compute = {
@@ -5254,6 +5271,7 @@ static const struct amdgpu_ring_funcs gfx_v12_0_ring_funcs_compute = {
        .emit_reg_write_reg_wait = gfx_v12_0_ring_emit_reg_write_reg_wait,
        .soft_recovery = gfx_v12_0_ring_soft_recovery,
        .emit_mem_sync = gfx_v12_0_emit_mem_sync,
+       .reset = gfx_v12_0_reset_ring,
 };
 
 static const struct amdgpu_ring_funcs gfx_v12_0_ring_funcs_kiq = {