Skip to content

Commit 3871149

Browse files
committed
drm/amdgpu/vcn5: 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 6166e37 commit 3871149

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,20 +1204,14 @@ static int vcn_v5_0_0_ring_reset(struct amdgpu_ring *ring,
12041204
if (!(adev->vcn.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
12051205
return -EOPNOTSUPP;
12061206

1207-
drm_sched_wqueue_stop(&ring->sched);
1207+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
12081208
r = vcn_v5_0_0_stop(vinst);
12091209
if (r)
12101210
return r;
12111211
r = vcn_v5_0_0_start(vinst);
12121212
if (r)
12131213
return r;
1214-
1215-
r = amdgpu_ring_test_helper(ring);
1216-
if (r)
1217-
return r;
1218-
amdgpu_fence_driver_force_completion(ring);
1219-
drm_sched_wqueue_start(&ring->sched);
1220-
return 0;
1214+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
12211215
}
12221216

12231217
static const struct amdgpu_ring_funcs vcn_v5_0_0_unified_ring_vm_funcs = {

0 commit comments

Comments
 (0)