Skip to content

Commit 98f1663

Browse files
committed
drm/amdgpu/jpeg4.0.3: 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 429ccbf commit 98f1663

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,20 +1147,13 @@ static int jpeg_v4_0_3_ring_reset(struct amdgpu_ring *ring,
11471147
unsigned int vmid,
11481148
struct amdgpu_fence *timedout_fence)
11491149
{
1150-
int r;
1151-
11521150
if (amdgpu_sriov_vf(ring->adev))
11531151
return -EOPNOTSUPP;
11541152

1155-
drm_sched_wqueue_stop(&ring->sched);
1153+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
11561154
jpeg_v4_0_3_core_stall_reset(ring);
11571155
jpeg_v4_0_3_start_jrbc(ring);
1158-
r = amdgpu_ring_test_helper(ring);
1159-
if (r)
1160-
return r;
1161-
amdgpu_fence_driver_force_completion(ring);
1162-
drm_sched_wqueue_start(&ring->sched);
1163-
return 0;
1156+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
11641157
}
11651158

11661159
static const struct amd_ip_funcs jpeg_v4_0_3_ip_funcs = {

0 commit comments

Comments
 (0)