Skip to content

Commit d156ba3

Browse files
committed
drm/amdgpu/vcn4: 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 8bea669 commit d156ba3

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,20 +1979,14 @@ static int vcn_v4_0_ring_reset(struct amdgpu_ring *ring,
19791979
if (!(adev->vcn.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
19801980
return -EOPNOTSUPP;
19811981

1982-
drm_sched_wqueue_stop(&ring->sched);
1982+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
19831983
r = vcn_v4_0_stop(vinst);
19841984
if (r)
19851985
return r;
19861986
r = vcn_v4_0_start(vinst);
19871987
if (r)
19881988
return r;
1989-
1990-
r = amdgpu_ring_test_helper(ring);
1991-
if (r)
1992-
return r;
1993-
amdgpu_fence_driver_force_completion(ring);
1994-
drm_sched_wqueue_start(&ring->sched);
1995-
return 0;
1989+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
19961990
}
19971991

19981992
static struct amdgpu_ring_funcs vcn_v4_0_unified_ring_vm_funcs = {

0 commit comments

Comments
 (0)