summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2025-07-07 11:26:14 -0400
committerAlex Deucher <alexander.deucher@amd.com>2025-07-15 14:07:34 -0400
commitd115a63f816035f976e14b7eba8f14e8e33c0945 (patch)
tree7788ff05d38cc0d3f3545dd4fb011cba9a6cc878
parenta4b2ba8f631d3e44b30b9b46ee290fbfe608b7d0 (diff)
drm/amdgpu/vcn4: add additional ring reset error checking
Start and stop can fail, so add checks. Fixes: b8b6e6f1654d ("drm/amd: Add per-ring reset for vcn v4.0.0 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.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
index eec9133e1b2c..5bbce8544fef 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
@@ -1979,8 +1979,12 @@ static int vcn_v4_0_ring_reset(struct amdgpu_ring *ring,
return -EOPNOTSUPP;
drm_sched_wqueue_stop(&ring->sched);
- vcn_v4_0_stop(vinst);
- vcn_v4_0_start(vinst);
+ r = vcn_v4_0_stop(vinst);
+ if (r)
+ return r;
+ r = vcn_v4_0_start(vinst);
+ if (r)
+ return r;
r = amdgpu_ring_test_helper(ring);
if (r)