diff options
| author |   Alex Deucher <alexander.deucher@amd.com> | 2025-06-26 09:53:18 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2025-07-17 12:36:46 -0400 |
| commit | 1b49bddc5881f2dbf0ed8c53416620d60b59e8f3 (patch) | |
| tree | dad6441a2bd69959a93738bb697d8757f76416d9 | |
| parent | drm/amdgpu/sdma5: re-emit unprocessed state on ring reset (diff) | |
| download | wireguard-linux-1b49bddc5881f2dbf0ed8c53416620d60b59e8f3.tar.xz wireguard-linux-1b49bddc5881f2dbf0ed8c53416620d60b59e8f3.zip | |
drm/amdgpu/sdma5.2: re-emit unprocessed state on ring reset
Re-emit the unprocessed state after resetting the queue.
Reviewed-by: Jesse Zhang <Jesse.Zhang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c index e542195972dd..5d56029e88a6 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c @@ -1469,11 +1469,15 @@ static int sdma_v5_2_reset_queue(struct amdgpu_ring *ring, return -EINVAL; } + amdgpu_ring_reset_helper_begin(ring, timedout_fence); + amdgpu_amdkfd_suspend(adev, true); - r = amdgpu_sdma_reset_engine(adev, ring->me, false); + r = amdgpu_sdma_reset_engine(adev, ring->me, true); amdgpu_amdkfd_resume(adev, true); + if (r) + return r; - return r; + return amdgpu_ring_reset_helper_end(ring, timedout_fence); } static int sdma_v5_2_stop_queue(struct amdgpu_ring *ring) |