Skip to content

Commit 9753078

Browse files
committed
drm/amdgpu/sdma6: re-emit unprocessed state on ring reset
Re-emit the unprocessed state after resetting the queue. Reviewed-by: Jesse Zhang <[email protected]> Reviewed-by: Christian König <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 1b49bdd commit 9753078

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,7 +1586,7 @@ static int sdma_v6_0_reset_queue(struct amdgpu_ring *ring,
15861586
return -EINVAL;
15871587
}
15881588

1589-
drm_sched_wqueue_stop(&ring->sched);
1589+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
15901590

15911591
r = amdgpu_mes_reset_legacy_queue(adev, ring, vmid, true);
15921592
if (r)
@@ -1595,9 +1595,8 @@ static int sdma_v6_0_reset_queue(struct amdgpu_ring *ring,
15951595
r = sdma_v6_0_gfx_resume_instance(adev, ring->me, true);
15961596
if (r)
15971597
return r;
1598-
amdgpu_fence_driver_force_completion(ring);
1599-
drm_sched_wqueue_start(&ring->sched);
1600-
return 0;
1598+
1599+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
16011600
}
16021601

16031602
static int sdma_v6_0_set_trap_irq_state(struct amdgpu_device *adev,

0 commit comments

Comments
 (0)