Commit f9d8c5c7 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu/gfx: enable mes to map legacy queue support 



Enable mes to map legacy queue support.

v2: kiq_set_resources is required.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d53ce023

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

+41 −9
Original line number Diff line number Diff line
@@ -623,9 +623,13 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev, int xcc_id) 
		queue_mask |= (1ull << amdgpu_queue_mask_bit_to_set_resource_bit(adev, i));

	}



	amdgpu_device_flush_hdp(adev, NULL);



	if (adev->enable_mes)

		queue_mask = ~0ULL;



	DRM_INFO("kiq ring mec %d pipe %d q %d\n", kiq_ring->me, kiq_ring->pipe,

		 kiq_ring->queue);

	amdgpu_device_flush_hdp(adev, NULL);



	spin_lock(&kiq->ring_lock);

	r = amdgpu_ring_alloc(kiq_ring, kiq->pmf->map_queues_size *
@@ -637,21 +641,35 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev, int xcc_id) 
		return r;

	}



	if (adev->enable_mes)

		queue_mask = ~0ULL;



	kiq->pmf->kiq_set_resources(kiq_ring, queue_mask);



	if (!adev->enable_mes) {

		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[j]);

		}

	}



	r = amdgpu_ring_test_helper(kiq_ring);

	spin_unlock(&kiq->ring_lock);

	if (r)

		DRM_ERROR("KCQ enable failed\n");



	if (adev->enable_mes) {

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

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

			r = amdgpu_mes_map_legacy_queue(adev,

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

			if (r) {

				DRM_ERROR("failed to map compute queue\n");

				return r;

			}

		}



		return 0;

	}



	return r;

}
@@ -666,6 +684,20 @@ int amdgpu_gfx_enable_kgq(struct amdgpu_device *adev, int xcc_id) 


	amdgpu_device_flush_hdp(adev, NULL);



	if (adev->enable_mes) {

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

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

			r = amdgpu_mes_map_legacy_queue(adev,

							&adev->gfx.gfx_ring[j]);

			if (r) {

				DRM_ERROR("failed to map gfx queue\n");

				return r;

			}

		}



		return 0;

	}



	spin_lock(&kiq->ring_lock);

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

	if (amdgpu_gfx_is_master_xcc(adev, xcc_id)) {