On 7/7/2025 3:03 PM, Alex Deucher wrote:
Start and stop can fail, so add checks.
Fixes: d1a46cdd0053 ("drm/amd: Add per-ring reset for vcn v4.0.5 use")
Signed-off-by: Alex Deucher <[email protected]>
Cc: Mario Limonciello <[email protected]>
Reviewed-by: Mario Limonciello <[email protected]>
---
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 7e37ddea63550..6000c528ad6ae 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)
