Commit 730ea507 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gfx9: fix kiq locking in KCQ reset 



The ring test needs to be inside the lock.

Fixes: fdbd6948 ("drm/amdgpu/gfx9: wait for reset done before remap")
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: Jiadong Zhu <Jiadong.Zhu@amd.com>
parent 8ff4a4b9

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

+1 −1
Original line number Diff line number Diff line
@@ -7238,8 +7238,8 @@ static int gfx_v9_0_reset_kcq(struct amdgpu_ring *ring, 
	}

	kiq->pmf->kiq_map_queues(kiq_ring, ring);

	amdgpu_ring_commit(kiq_ring);

	spin_unlock_irqrestore(&kiq->ring_lock, flags);

	r = amdgpu_ring_test_ring(kiq_ring);

	spin_unlock_irqrestore(&kiq->ring_lock, flags);

	if (r) {

		DRM_ERROR("fail to remap queue\n");

		return r;