Commit 08f116c5 authored by Alex Deucher's avatar Alex Deucher
Browse files

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



The ring test needs to be inside the lock.

Fixes: 4c953e53 ("drm/amdgpu/gfx_9.4.3: 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 730ea507

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

+1 −2
Original line number Diff line number Diff line
@@ -3615,9 +3615,8 @@ static int gfx_v9_4_3_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) {

		dev_err(adev->dev, "fail to remap queue\n");

		return r;