Skip to content

Commit 4b1df3b

Browse files
committed
drm/amdgpu/sdma5: 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 4da11b9 commit 4b1df3b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,11 +1555,15 @@ static int sdma_v5_0_reset_queue(struct amdgpu_ring *ring,
15551555
return -EINVAL;
15561556
}
15571557

1558+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
1559+
15581560
amdgpu_amdkfd_suspend(adev, true);
1559-
r = amdgpu_sdma_reset_engine(adev, ring->me, false);
1561+
r = amdgpu_sdma_reset_engine(adev, ring->me, true);
15601562
amdgpu_amdkfd_resume(adev, true);
1563+
if (r)
1564+
return r;
15611565

1562-
return r;
1566+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
15631567
}
15641568

15651569
static int sdma_v5_0_stop_queue(struct amdgpu_ring *ring)

0 commit comments

Comments
 (0)