Skip to content

Commit ea2791d

Browse files
committed
drm/amdgpu/sdma7: re-emit unprocessed state on ring reset
Re-emit the unprocessed state after resetting the queue. Reviewed-by: Jesse Zhang <Jesse.Zhang@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 9753078 commit ea2791d

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ static int sdma_v7_0_reset_queue(struct amdgpu_ring *ring,
817817
return -EINVAL;
818818
}
819819

820-
drm_sched_wqueue_stop(&ring->sched);
820+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
821821

822822
r = amdgpu_mes_reset_legacy_queue(adev, ring, vmid, true);
823823
if (r)
@@ -826,9 +826,8 @@ static int sdma_v7_0_reset_queue(struct amdgpu_ring *ring,
826826
r = sdma_v7_0_gfx_resume_instance(adev, ring->me, true);
827827
if (r)
828828
return r;
829-
amdgpu_fence_driver_force_completion(ring);
830-
drm_sched_wqueue_start(&ring->sched);
831-
return 0;
829+
830+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
832831
}
833832

834833
/**

0 commit comments

Comments
 (0)