Skip to content

Commit 6166e37

Browse files
committed
drm/amdgpu/vcn4.0.5: re-emit unprocessed state on ring reset
Re-emit the unprocessed state after resetting the queue. Reviewed-by: Sathishkumar S <[email protected]> Tested-by: Sathishkumar S <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 64c54f0 commit 6166e37

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,20 +1477,14 @@ static int vcn_v4_0_5_ring_reset(struct amdgpu_ring *ring,
14771477
if (!(adev->vcn.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
14781478
return -EOPNOTSUPP;
14791479

1480-
drm_sched_wqueue_stop(&ring->sched);
1480+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
14811481
r = vcn_v4_0_5_stop(vinst);
14821482
if (r)
14831483
return r;
14841484
r = vcn_v4_0_5_start(vinst);
14851485
if (r)
14861486
return r;
1487-
1488-
r = amdgpu_ring_test_helper(ring);
1489-
if (r)
1490-
return r;
1491-
amdgpu_fence_driver_force_completion(ring);
1492-
drm_sched_wqueue_start(&ring->sched);
1493-
return 0;
1487+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
14941488
}
14951489

14961490
static struct amdgpu_ring_funcs vcn_v4_0_5_unified_ring_vm_funcs = {

0 commit comments

Comments
 (0)