Commit 66daccde authored by Le Ma's avatar Le Ma Committed by Alex Deucher
Browse files

drm/amdgpu: add master/slave check in init phase 



Skip KCQ setup on slave xcc as there's no use case.

Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 224d3df9

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

+36 −23
Original line number Diff line number Diff line
@@ -489,17 +489,20 @@ int amdgpu_gfx_disable_kcq(struct amdgpu_device *adev, int xcc_id) 
		return -EINVAL;



	spin_lock(&kiq->ring_lock);

	if (amdgpu_gfx_is_master_xcc(adev, xcc_id)) {

		if (amdgpu_ring_alloc(kiq_ring, kiq->pmf->unmap_queues_size *

						adev->gfx.num_compute_rings)) {

		spin_unlock(&adev->gfx.kiq[0].ring_lock);

			spin_unlock(&kiq->ring_lock);

			return -ENOMEM;

		}



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

			j = i + xcc_id * adev->gfx.num_compute_rings;

		kiq->pmf->kiq_unmap_queues(kiq_ring, &adev->gfx.compute_ring[i],

			kiq->pmf->kiq_unmap_queues(kiq_ring,

						   &adev->gfx.compute_ring[i],

						   RESET_QUEUES, 0, 0);

		}

	}



	if (adev->gfx.kiq[0].ring.sched.ready && !adev->job_hang)

		r = amdgpu_ring_test_helper(kiq_ring);
@@ -549,6 +552,8 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev, int xcc_id) 
	DRM_INFO("kiq ring mec %d pipe %d q %d\n", kiq_ring->me, kiq_ring->pipe,

							kiq_ring->queue);

	spin_lock(&kiq->ring_lock);

	/* No need to map kcq on the slave */

	if (amdgpu_gfx_is_master_xcc(adev, xcc_id)) {

		r = amdgpu_ring_alloc(kiq_ring, kiq->pmf->map_queues_size *

						adev->gfx.num_compute_rings +

						kiq->pmf->set_resources_size);
@@ -564,7 +569,9 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev, int xcc_id) 
		kiq->pmf->kiq_set_resources(kiq_ring, queue_mask);

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

			j = i + xcc_id * adev->gfx.num_compute_rings;

		kiq->pmf->kiq_map_queues(kiq_ring, &adev->gfx.compute_ring[i]);

			kiq->pmf->kiq_map_queues(kiq_ring,

						 &adev->gfx.compute_ring[i]);

		}

	}



	r = amdgpu_ring_test_helper(kiq_ring);
@@ -1078,3 +1085,9 @@ void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev, 
		adev->firmware.fw_size += ALIGN(fw_size, PAGE_SIZE);

	}

}



bool amdgpu_gfx_is_master_xcc(struct amdgpu_device *adev, int xcc_id)

{

	return !(xcc_id % (adev->gfx.num_xcc_per_xcp ?

			adev->gfx.num_xcc_per_xcp : 1));

}

drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h

+2 −0
Original line number Diff line number Diff line
@@ -462,4 +462,6 @@ void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev, uint32_t ucode_id) 
int amdgpu_gfx_ras_sw_init(struct amdgpu_device *adev);

int amdgpu_gfx_poison_consumption_handler(struct amdgpu_device *adev,

						struct amdgpu_iv_entry *entry);



bool amdgpu_gfx_is_master_xcc(struct amdgpu_device *adev, int xcc_id);

#endif

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

+5 −0
Original line number Diff line number Diff line
@@ -406,6 +406,11 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev) 
		else

			tmo = tmo_gfx;



		/* skip ib test on the slave kcq */

		if (ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE &&

		    !amdgpu_gfx_is_master_xcc(adev, ring->xcc_id))

			continue;



		r = amdgpu_ring_test_ib(ring, tmo);

		if (!r) {

			DRM_DEV_DEBUG(adev->dev, "ib test on %s succeeded\n",

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

+7 −3
Original line number Diff line number Diff line
@@ -1885,10 +1885,14 @@ static int gfx_v9_4_3_cp_resume(struct amdgpu_device *adev) 
		if (r)

			return r;



		/* skip ring test on slave kcq */

		if (amdgpu_gfx_is_master_xcc(adev, i)) {

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

			ring = &adev->gfx.compute_ring[j + i * adev->gfx.num_compute_rings];

				ring = &adev->gfx.compute_ring[j +

					i * adev->gfx.num_compute_rings];

				amdgpu_ring_test_helper(ring);

			}

		}



		gfx_v9_4_3_enable_gui_idle_interrupt(adev, true, i);

	}