Skip to content

Commit 1b556bc

Browse files
committed
drm/amdgpu/vcn4.0.5: add additional ring reset error checking
Start and stop can fail, so add checks. Fixes: d1a46cd ("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>
1 parent d115a63 commit 1b556bc

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,8 +1477,12 @@ static int vcn_v4_0_5_ring_reset(struct amdgpu_ring *ring,
14771477
return -EOPNOTSUPP;
14781478

14791479
drm_sched_wqueue_stop(&ring->sched);
1480-
vcn_v4_0_5_stop(vinst);
1481-
vcn_v4_0_5_start(vinst);
1480+
r = vcn_v4_0_5_stop(vinst);
1481+
if (r)
1482+
return r;
1483+
r = vcn_v4_0_5_start(vinst);
1484+
if (r)
1485+
return r;
14821486

14831487
r = amdgpu_ring_test_helper(ring);
14841488
if (r)

0 commit comments

Comments
 (0)