Skip to content

Commit 08f116c

Browse files
committed
drm/amdgpu/gfx9.4.3: fix kiq locking in KCQ reset
The ring test needs to be inside the lock. Fixes: 4c953e5 ("drm/amdgpu/gfx_9.4.3: wait for reset done before remap") Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: Jiadong Zhu <Jiadong.Zhu@amd.com>
1 parent 730ea50 commit 08f116c

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3615,9 +3615,8 @@ static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring *ring,
36153615
}
36163616
kiq->pmf->kiq_map_queues(kiq_ring, ring);
36173617
amdgpu_ring_commit(kiq_ring);
3618-
spin_unlock_irqrestore(&kiq->ring_lock, flags);
3619-
36203618
r = amdgpu_ring_test_ring(kiq_ring);
3619+
spin_unlock_irqrestore(&kiq->ring_lock, flags);
36213620
if (r) {
36223621
dev_err(adev->dev, "fail to remap queue\n");
36233622
return r;

0 commit comments

Comments
 (0)