summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2025-07-07 11:28:33 -0400
committerAlex Deucher <alexander.deucher@amd.com>2025-07-15 14:07:39 -0400
commit1b556bcc3837441b9f75d2c7df44e8e312b550e7 (patch)
tree1c68b0a0ef4229c482b64836e74cf7a35503b91a
parentd115a63f816035f976e14b7eba8f14e8e33c0945 (diff)
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 <mari.limonciello@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: Mario Limonciello <mario.limonciello@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c8
1 files 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)