Skip to content

Commit 429ccbf

Browse files
committed
drm/amdgpu/jpeg4: 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 b818915 commit 429ccbf

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -730,19 +730,14 @@ static int jpeg_v4_0_ring_reset(struct amdgpu_ring *ring,
730730
if (!(ring->adev->jpeg.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
731731
return -EOPNOTSUPP;
732732

733-
drm_sched_wqueue_stop(&ring->sched);
733+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
734734
r = jpeg_v4_0_stop(ring->adev);
735735
if (r)
736736
return r;
737737
r = jpeg_v4_0_start(ring->adev);
738738
if (r)
739739
return r;
740-
r = amdgpu_ring_test_helper(ring);
741-
if (r)
742-
return r;
743-
amdgpu_fence_driver_force_completion(ring);
744-
drm_sched_wqueue_start(&ring->sched);
745-
return 0;
740+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
746741
}
747742

748743
static const struct amd_ip_funcs jpeg_v4_0_ip_funcs = {

0 commit comments

Comments
 (0)