From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 7 Jul 2025 15:26:14 +0000 (-0400)
Subject: drm/amdgpu/vcn4: add additional ring reset error checking
X-Git-Tag: io_uring-6.17-20250815~29^2~7^2~77
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d115a63f816035f976e14b7eba8f14e8e33c0945;p=linux-block.git

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

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)