From f8410a17d377d062ef381316669653fb0ba0edc5 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Thu, 26 Jun 2025 08:49:07 -0400 Subject: 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 Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c') 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); -- cgit v1.2.3