Commit 14b2d71a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gfx10: fix KGQ reset sequence 



Need to reinit the ring before remapping it and all of
the KIQ handling needs to be within the kiq lock.

Fixes: 1741281a ("drm/amdgpu/gfx10: add ring reset callbacks")
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 127ed492

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

+15 −5
Original line number Diff line number Diff line
@@ -9544,7 +9544,7 @@ static int gfx_v10_0_reset_kgq(struct amdgpu_ring *ring, 


	spin_lock_irqsave(&kiq->ring_lock, flags);



	if (amdgpu_ring_alloc(kiq_ring, 5 + 7 + 7 + kiq->pmf->map_queues_size)) {

	if (amdgpu_ring_alloc(kiq_ring, 5 + 7 + 7)) {

		spin_unlock_irqrestore(&kiq->ring_lock, flags);

		return -ENOMEM;

	}
@@ -9564,12 +9564,9 @@ static int gfx_v10_0_reset_kgq(struct amdgpu_ring *ring, 
			       0, 1, 0x20);

	gfx_v10_0_ring_emit_reg_wait(kiq_ring,

				     SOC15_REG_OFFSET(GC, 0, mmCP_VMID_RESET), 0, 0xffffffff);

	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)

		return r;
@@ -9579,6 +9576,19 @@ static int gfx_v10_0_reset_kgq(struct amdgpu_ring *ring, 
		return r;

	}



	spin_lock_irqsave(&kiq->ring_lock, flags);



	if (amdgpu_ring_alloc(kiq_ring, kiq->pmf->map_queues_size)) {

		spin_unlock_irqrestore(&kiq->ring_lock, flags);

		return -ENOMEM;

	}

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

	amdgpu_ring_commit(kiq_ring);

	r = amdgpu_ring_test_ring(kiq_ring);

	spin_unlock_irqrestore(&kiq->ring_lock, flags);

	if (r)

		return r;



	r = amdgpu_ring_test_ring(ring);

	if (r)

		return r;