Commit ffabea84 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: Refine gfx_v9_0_kcq_disable function 



Send all kcq unmap_queue packets and then wait for
complete.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 841cf911

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

+16 −17
Original line number Diff line number Diff line
@@ -3216,17 +3216,18 @@ static int gfx_v9_0_hw_init(void *handle) 
	return r;

}



static int gfx_v9_0_kcq_disable(struct amdgpu_ring *kiq_ring,struct amdgpu_ring *ring)

static int gfx_v9_0_kcq_disable(struct amdgpu_device *adev)

{

	int r;

	int r, i;

	struct amdgpu_ring *kiq_ring = &adev->gfx.kiq.ring;



	r = amdgpu_ring_alloc(kiq_ring, 6);

	if (r) {

	r = amdgpu_ring_alloc(kiq_ring, 6 * adev->gfx.num_compute_rings);

	if (r)

		DRM_ERROR("Failed to lock KIQ (%d).\n", r);

		return r;

	}



	/* unmap queues */

	for (i = 0; i < adev->gfx.num_compute_rings; i++) {

		struct amdgpu_ring *ring = &adev->gfx.compute_ring[i];



		amdgpu_ring_write(kiq_ring, PACKET3(PACKET3_UNMAP_QUEUES, 4));

		amdgpu_ring_write(kiq_ring, /* Q_sel: 0, vmid: 0, engine: 0, num_Q: 1 */

						PACKET3_UNMAP_QUEUES_ACTION(1) | /* RESET_QUEUES */
@@ -3237,7 +3238,7 @@ static int gfx_v9_0_kcq_disable(struct amdgpu_ring *kiq_ring,struct amdgpu_ring 
		amdgpu_ring_write(kiq_ring, 0);

		amdgpu_ring_write(kiq_ring, 0);

		amdgpu_ring_write(kiq_ring, 0);



	}

	r = amdgpu_ring_test_ring(kiq_ring);

	if (r)

		DRM_ERROR("KCQ disable failed\n");
@@ -3248,14 +3249,12 @@ static int gfx_v9_0_kcq_disable(struct amdgpu_ring *kiq_ring,struct amdgpu_ring 
static int gfx_v9_0_hw_fini(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	int i;



	amdgpu_irq_put(adev, &adev->gfx.priv_reg_irq, 0);

	amdgpu_irq_put(adev, &adev->gfx.priv_inst_irq, 0);



	/* disable KCQ to avoid CPC touch memory not valid anymore */

	for (i = 0; i < adev->gfx.num_compute_rings; i++)

		gfx_v9_0_kcq_disable(&adev->gfx.kiq.ring, &adev->gfx.compute_ring[i]);

	gfx_v9_0_kcq_disable(adev);



	if (amdgpu_sriov_vf(adev)) {

		gfx_v9_0_cp_gfx_enable(adev, false);