Skip to content

Commit b818915

Browse files
committed
drm/amdgpu/jpeg3: 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 bb7928f commit b818915

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -565,19 +565,14 @@ static int jpeg_v3_0_ring_reset(struct amdgpu_ring *ring,
565565
if (!(ring->adev->jpeg.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
566566
return -EOPNOTSUPP;
567567

568-
drm_sched_wqueue_stop(&ring->sched);
568+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
569569
r = jpeg_v3_0_stop(ring->adev);
570570
if (r)
571571
return r;
572572
r = jpeg_v3_0_start(ring->adev);
573573
if (r)
574574
return r;
575-
r = amdgpu_ring_test_helper(ring);
576-
if (r)
577-
return r;
578-
amdgpu_fence_driver_force_completion(ring);
579-
drm_sched_wqueue_start(&ring->sched);
580-
return 0;
575+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
581576
}
582577

583578
static const struct amd_ip_funcs jpeg_v3_0_ip_funcs = {

0 commit comments

Comments
 (0)