From 94ee19ea149f3d9ffc4baa8a7977c1aa8b878f8e Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 7 Jul 2025 11:00:24 -0400 Subject: [PATCH 4403/5403] drm/amdgpu/jpeg4: add additional ring reset error checking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Start and stop can fail, so add checks. Fixes: 74894ffc7d0c ("drm/amdgpu: Add ring reset callback for JPEG4_0_0") Reviewed-by: Sathishkumar S Reviewed-by: Christian König Signed-off-by: Alex Deucher Cc: Sathishkumar S --- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c index 1d4edd77837d..78fe1924f3cb 100644 --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c @@ -730,8 +730,12 @@ static int jpeg_v4_0_ring_reset(struct amdgpu_ring *ring, return -EINVAL; drm_sched_wqueue_stop(&ring->sched); - jpeg_v4_0_stop(ring->adev); - jpeg_v4_0_start(ring->adev); + r = jpeg_v4_0_stop(ring->adev); + if (r) + return r; + r = jpeg_v4_0_start(ring->adev); + if (r) + return r; r = amdgpu_ring_test_helper(ring); if (r) return r; -- 2.54.0