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 eec9133e1b2c4fe20ef8e6f9679002dbdc2f46a1..5bbce8544fef0249697782054400b6064bc6f282 100644 (file)
--- 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)