Skip to content

Commit 8bea669

Browse files
committed
drm/amdgpu/jpeg5.0.1: re-emit unprocessed state on ring reset
Re-emit the unprocessed state after resetting the queue. Reviewed-by: Sathishkumar S <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent e708f2c commit 8bea669

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -838,20 +838,13 @@ static int jpeg_v5_0_1_ring_reset(struct amdgpu_ring *ring,
838838
unsigned int vmid,
839839
struct amdgpu_fence *timedout_fence)
840840
{
841-
int r;
842-
843841
if (amdgpu_sriov_vf(ring->adev))
844842
return -EOPNOTSUPP;
845843

846-
drm_sched_wqueue_stop(&ring->sched);
844+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
847845
jpeg_v5_0_1_core_stall_reset(ring);
848846
jpeg_v5_0_1_init_jrbc(ring);
849-
r = amdgpu_ring_test_helper(ring);
850-
if (r)
851-
return r;
852-
amdgpu_fence_driver_force_completion(ring);
853-
drm_sched_wqueue_start(&ring->sched);
854-
return 0;
847+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
855848
}
856849

857850
static const struct amd_ip_funcs jpeg_v5_0_1_ip_funcs = {

0 commit comments

Comments
 (0)