Skip to content

Commit e22631b

Browse files
committed
drm/amdgpu/gfx9.4.3: re-emit unprocessed state on kcq reset
Re-emit the unprocessed state after resetting the queue. Reviewed-by: Jesse Zhang <[email protected]> Reviewed-by: Christian König <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent ee60209 commit e22631b

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3571,7 +3571,7 @@ static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring *ring,
35713571
if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)
35723572
return -EINVAL;
35733573

3574-
drm_sched_wqueue_stop(&ring->sched);
3574+
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
35753575

35763576
spin_lock_irqsave(&kiq->ring_lock, flags);
35773577

@@ -3628,12 +3628,7 @@ static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring *ring,
36283628
return r;
36293629
}
36303630

3631-
r = amdgpu_ring_test_ring(ring);
3632-
if (r)
3633-
return r;
3634-
amdgpu_fence_driver_force_completion(ring);
3635-
drm_sched_wqueue_start(&ring->sched);
3636-
return 0;
3631+
return amdgpu_ring_reset_helper_end(ring, timedout_fence);
36373632
}
36383633

36393634
enum amdgpu_gfx_cp_ras_mem_id {

0 commit comments

Comments
 (0)