Skip to content

Commit bcee4c3

Browse files
committed
drm/amdgpu/gfx10: use proper rlc safe mode helpers
Rather than open coding it for the queue reset. Acked-by: Vitaly Prosyak <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 1a1995b commit bcee4c3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9515,7 +9515,7 @@ static int gfx_v10_0_reset_kcq(struct amdgpu_ring *ring,
95159515
return r;
95169516

95179517
/* make sure dequeue is complete*/
9518-
gfx_v10_0_set_safe_mode(adev, 0);
9518+
amdgpu_gfx_rlc_enter_safe_mode(adev, 0);
95199519
mutex_lock(&adev->srbm_mutex);
95209520
nv_grbm_select(adev, ring->me, ring->pipe, ring->queue, 0);
95219521
for (i = 0; i < adev->usec_timeout; i++) {
@@ -9527,7 +9527,7 @@ static int gfx_v10_0_reset_kcq(struct amdgpu_ring *ring,
95279527
r = -ETIMEDOUT;
95289528
nv_grbm_select(adev, 0, 0, 0, 0);
95299529
mutex_unlock(&adev->srbm_mutex);
9530-
gfx_v10_0_unset_safe_mode(adev, 0);
9530+
amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
95319531
if (r) {
95329532
dev_err(adev->dev, "fail to wait on hqd deactivate\n");
95339533
return r;

0 commit comments

Comments
 (0)