On 12.07.25 00:39, Alex Deucher wrote:
> Start and stop can fail, so add checks.
>
> Fixes: 500c04d2a708 ("drm/amdgpu: Add ring reset callback for JPEG2_0_0")
> Signed-off-by: Alex Deucher <[email protected]>
> Cc: Sathishkumar S <[email protected]>
Reviewed-by: Christian König <[email protected]> for patches #2-#4.
> ---
> drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
> index 781a5a8a83614..5ba1c5ad9a5e1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
> @@ -771,8 +771,12 @@ static int jpeg_v2_0_ring_reset(struct amdgpu_ring *ring,
> int r;
>
> drm_sched_wqueue_stop(&ring->sched);
> - jpeg_v2_0_stop(ring->adev);
> - jpeg_v2_0_start(ring->adev);
> + r = jpeg_v2_0_stop(ring->adev);
> + if (r)
> + return r;
> + r = jpeg_v2_0_start(ring->adev);
> + if (r)
> + return r;
> r = amdgpu_ring_test_helper(ring);
> if (r)
> return r;
