diff options
| author | Alex Deucher <[email protected]> | 2025-05-29 17:12:35 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2025-07-17 16:36:54 +0000 |
| commit | ea2791d05a2e8bd483df48f548e0293edc3bcc0f (patch) | |
| tree | eceb4ef96f58f1a6798fab1f748e2d75e19f3cb5 /drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | |
| parent | drm/amdgpu/sdma6: re-emit unprocessed state on ring reset (diff) | |
| download | kernel-ea2791d05a2e8bd483df48f548e0293edc3bcc0f.tar.gz kernel-ea2791d05a2e8bd483df48f548e0293edc3bcc0f.zip | |
drm/amdgpu/sdma7: 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]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c index ba1f3e3b6eb6..13abc0c46eab 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c @@ -817,7 +817,7 @@ static int sdma_v7_0_reset_queue(struct amdgpu_ring *ring, return -EINVAL; } - drm_sched_wqueue_stop(&ring->sched); + amdgpu_ring_reset_helper_begin(ring, timedout_fence); r = amdgpu_mes_reset_legacy_queue(adev, ring, vmid, true); if (r) @@ -826,9 +826,8 @@ static int sdma_v7_0_reset_queue(struct amdgpu_ring *ring, r = sdma_v7_0_gfx_resume_instance(adev, ring->me, true); if (r) return r; - amdgpu_fence_driver_force_completion(ring); - drm_sched_wqueue_start(&ring->sched); - return 0; + + return amdgpu_ring_reset_helper_end(ring, timedout_fence); } /** |
