From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 7 Jul 2025 15:00:24 +0000 (-0400)
Subject: drm/amdgpu/jpeg4: add additional ring reset error checking
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94ee19ea149f3d9ffc4baa8a7977c1aa8b878f8e;p=thirdparty%2Fkernel%2Flinux.git

drm/amdgpu/jpeg4: add additional ring reset error checking

Start and stop can fail, so add checks.

Fixes: 74894ffc7d0c ("drm/amdgpu: Add ring reset callback for JPEG4_0_0")
Reviewed-by: Sathishkumar S <sathishkumar.sundararaju@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Sathishkumar S <sathishkumar.sundararaju@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
index 1d4edd77837d0..78fe1924f3cb7 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;