summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2025-07-07 11:30:14 -0400
committerAlex Deucher <alexander.deucher@amd.com>2025-07-15 14:07:43 -0400
commit7a5b69d60e448e134c7afa023e2a960d012b7a4f (patch)
tree7bb400cbb6e6ffc54475387e96437ce2df7ca26f
parent1b556bcc3837441b9f75d2c7df44e8e312b550e7 (diff)
drm/amdgpu/vcn5: add additional ring reset error checking
Start and stop can fail, so add checks. Fixes: b54695dae995 ("drm/amd: Add per-ring reset for vcn v5.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_v5_0_0.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
index 47c0bcc9e7d8..3d3b4254bd72 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
@@ -1204,8 +1204,12 @@ static int vcn_v5_0_0_ring_reset(struct amdgpu_ring *ring,
return -EOPNOTSUPP;
drm_sched_wqueue_stop(&ring->sched);
- vcn_v5_0_0_stop(vinst);
- vcn_v5_0_0_start(vinst);
+ r = vcn_v5_0_0_stop(vinst);
+ if (r)
+ return r;
+ r = vcn_v5_0_0_start(vinst);
+ if (r)
+ return r;
r = amdgpu_ring_test_helper(ring);
if (r)