From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 7 Jul 2025 15:30:14 +0000 (-0400)
Subject: drm/amdgpu/vcn5: add additional ring reset error checking
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a5b69d60e448e134c7afa023e2a960d012b7a4f;p=thirdparty%2Fkernel%2Flinux.git

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>
---

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 47c0bcc9e7d80..3d3b4254bd729 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)