summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2025-07-07 10:56:07 -0400
committerAlex Deucher <alexander.deucher@amd.com>2025-07-16 16:08:59 -0400
commit29184874556adff0399580280a077f3a2833396e (patch)
tree24fcab03c79d2b676cbfb7645039c1cdb5053cd2
parentc9bfafc1a672978b7608fcfb5f498ea1acf4dd24 (diff)
drm/amdgpu/jpeg3: add additional ring reset error checking
Start and stop can fail, so add checks. Fixes: 03399d0bff25 ("drm/amdgpu: Add ring reset callback for JPEG3_0_0") Reviewed-by: Sathishkumar S <sathishkumar.sundararaju@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: Sathishkumar S <sathishkumar.sundararaju@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
index a24bd833d644..5428930eafa3 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
@@ -562,8 +562,12 @@ static int jpeg_v3_0_ring_reset(struct amdgpu_ring *ring,
int r;
drm_sched_wqueue_stop(&ring->sched);
- jpeg_v3_0_stop(ring->adev);
- jpeg_v3_0_start(ring->adev);
+ r = jpeg_v3_0_stop(ring->adev);
+ if (r)
+ return r;
+ r = jpeg_v3_0_start(ring->adev);
+ if (r)
+ return r;
r = amdgpu_ring_test_helper(ring);
if (r)
return r;