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

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

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)