From 1b556bcc3837441b9f75d2c7df44e8e312b550e7 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 7 Jul 2025 11:28:33 -0400 Subject: [PATCH 4360/5403] drm/amdgpu/vcn4.0.5: add additional ring reset error checking Start and stop can fail, so add checks. Fixes: d1a46cdd0053 ("drm/amd: Add per-ring reset for vcn v4.0.5 use") Reviewed-by: Mario Limonciello Signed-off-by: Alex Deucher Cc: Mario Limonciello --- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c index 7e37ddea6355..6000c528ad6a 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c @@ -1477,8 +1477,12 @@ static int vcn_v4_0_5_ring_reset(struct amdgpu_ring *ring, return -EOPNOTSUPP; drm_sched_wqueue_stop(&ring->sched); - vcn_v4_0_5_stop(vinst); - vcn_v4_0_5_start(vinst); + r = vcn_v4_0_5_stop(vinst); + if (r) + return r; + r = vcn_v4_0_5_start(vinst); + if (r) + return r; r = amdgpu_ring_test_helper(ring); if (r) -- 2.54.0