Skip to content

Commit 3c9e205

Browse files
committed
drm/amdgpu/jpeg2: 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 461f43b commit 3c9e205

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -774,19 +774,14 @@ static int jpeg_v2_0_ring_reset(struct amdgpu_ring *ring,
774774
if (!(ring->adev->jpeg.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
775775
return -EOPNOTSUPP;
776776

777-
drm_sched_wqueue_stop(&ring->sched);
777+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
778778
r = jpeg_v2_0_stop(ring->adev);
779779
if (r)
780780
return r;
781781
r = jpeg_v2_0_start(ring->adev);
782782
if (r)
783783
return r;
784-
r = amdgpu_ring_test_helper(ring);
785-
if (r)
786-
return r;
787-
amdgpu_fence_driver_force_completion(ring);
788-
drm_sched_wqueue_start(&ring->sched);
789-
return 0;
784+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
790785
}
791786

792787
static const struct amd_ip_funcs jpeg_v2_0_ip_funcs = {

0 commit comments

Comments
 (0)