[PATCH 14/31] drm/amdgpu/sdma6: 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/sdma_v6_0.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c 
b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index ffb90b42a3e34..7ff9f14691e57 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -1537,11 +1537,23 @@ static int sdma_v6_0_ring_preempt_ib(struct amdgpu_ring 
*ring)
        return r;
 }
 
+static bool sdma_v6_0_is_queue_selected(struct amdgpu_device *adev,
+                                       u32 instance_id)
+{
+       /* we always use queue0 for KGD */
+       u32 context_status = RREG32(sdma_v6_0_get_reg_offset(adev, instance_id,
+                                                            
regSDMA0_QUEUE0_CONTEXT_STATUS));
+
+       /* Check if the SELECTED bit is set */
+       return (context_status & SDMA0_QUEUE0_CONTEXT_STATUS__SELECTED_MASK) != 
0;
+}
+
 static int sdma_v6_0_reset_queue(struct amdgpu_ring *ring,
                                 unsigned int vmid,
                                 struct amdgpu_fence *timedout_fence)
 {
        struct amdgpu_device *adev = ring->adev;
+       bool is_guilty;
        int i, r;
 
        if (amdgpu_sriov_vf(adev))
@@ -1557,7 +1569,8 @@ static int sdma_v6_0_reset_queue(struct amdgpu_ring *ring,
                return -EINVAL;
        }
 
-       drm_sched_wqueue_stop(&ring->sched);
+       is_guilty = sdma_v6_0_is_queue_selected(adev, i);
+       amdgpu_ring_reset_helper_begin(ring, is_guilty ? timedout_fence : NULL);
 
        r = amdgpu_mes_reset_legacy_queue(adev, ring, vmid, true);
        if (r)
@@ -1566,9 +1579,8 @@ static int sdma_v6_0_reset_queue(struct amdgpu_ring *ring,
        r = sdma_v6_0_gfx_resume_instance(adev, i, true);
        if (r)
                return r;
-       amdgpu_fence_driver_force_completion(ring);
-       drm_sched_wqueue_start(&ring->sched);
-       return 0;
+
+       return amdgpu_ring_reset_helper_end(ring, is_guilty ? timedout_fence : 
NULL);
 }
 
 static int sdma_v6_0_set_trap_irq_state(struct amdgpu_device *adev,
-- 
2.49.0