Skip to content

Commit 1b49bdd

Browse files
committed
drm/amdgpu/sdma5.2: 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 4b1df3b commit 1b49bdd

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,11 +1469,15 @@ static int sdma_v5_2_reset_queue(struct amdgpu_ring *ring,
14691469
return -EINVAL;
14701470
}
14711471

1472+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
1473+
14721474
amdgpu_amdkfd_suspend(adev, true);
1473-
r = amdgpu_sdma_reset_engine(adev, ring->me, false);
1475+
r = amdgpu_sdma_reset_engine(adev, ring->me, true);
14741476
amdgpu_amdkfd_resume(adev, true);
1477+
if (r)
1478+
return r;
14751479

1476-
return r;
1480+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
14771481
}
14781482

14791483
static int sdma_v5_2_stop_queue(struct amdgpu_ring *ring)

0 commit comments

Comments
 (0)