diff options
| author | Alex Deucher <[email protected]> | 2025-06-26 12:49:07 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2025-07-07 17:48:20 +0000 |
| commit | f8410a17d377d062ef381316669653fb0ba0edc5 (patch) | |
| tree | b0e7de6a7f30350881adc2fc88e9bca8848e8541 /drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | |
| parent | drm/amdkfd: Avoid queue reset if disabled (diff) | |
| download | kernel-f8410a17d377d062ef381316669653fb0ba0edc5.tar.gz kernel-f8410a17d377d062ef381316669653fb0ba0edc5.zip | |
drm/amdgpu/sdma: consolidate engine reset handling
Move the force completion handling into the common
engine reset function. No need to duplicate it for
every IP version.
Reviewed-by: Jesse Zhang <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c index 7e26a44dcc1f..56939bb1d1a9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c @@ -590,9 +590,12 @@ exit: * to be submitted to the queues after the reset is complete. */ if (!ret) { + amdgpu_fence_driver_force_completion(gfx_ring); drm_sched_wqueue_start(&gfx_ring->sched); - if (adev->sdma.has_page_queue) + if (adev->sdma.has_page_queue) { + amdgpu_fence_driver_force_completion(page_ring); drm_sched_wqueue_start(&page_ring->sched); + } } mutex_unlock(&sdma_instance->engine_reset_mutex); |