Skip to content

Commit 94ee19e

Browse files
committed
drm/amdgpu/jpeg4: add additional ring reset error checking
Start and stop can fail, so add checks. Fixes: 74894ff ("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>
1 parent 2918487 commit 94ee19e

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,8 +730,12 @@ static int jpeg_v4_0_ring_reset(struct amdgpu_ring *ring,
730730
return -EINVAL;
731731

732732
drm_sched_wqueue_stop(&ring->sched);
733-
jpeg_v4_0_stop(ring->adev);
734-
jpeg_v4_0_start(ring->adev);
733+
r = jpeg_v4_0_stop(ring->adev);
734+
if (r)
735+
return r;
736+
r = jpeg_v4_0_start(ring->adev);
737+
if (r)
738+
return r;
735739
r = amdgpu_ring_test_helper(ring);
736740
if (r)
737741
return r;

0 commit comments

Comments
 (0)