Commit ec3db8a6 authored by Philip Yang's avatar Philip Yang Committed by Alex Deucher
Browse files

drm/amdgpu: enable paging queue doorbell support v4 



Because increase SDMA_DOORBELL_RANGE to add new SDMA doorbell for paging queue will
break SRIOV, instead we can reserve and map two doorbell pages for amdgpu, paging
queues doorbell index use same index as SDMA gfx queues index but on second page.

For Vega20, after we change doorbell layout to increase SDMA doorbell for 8 SDMA RLC
queues later, we could use new doorbell index for paging queue.

Signed-off-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bc5ab2d2

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

+6 −0
Original line number Diff line number Diff line
@@ -534,6 +534,12 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev) 
	if (adev->doorbell.num_doorbells == 0)

		return -EINVAL;



	/* For Vega, reserve and map two pages on doorbell BAR since SDMA

	 * paging queue doorbell use the second page

	 */

	if (adev->asic_type >= CHIP_VEGA10)

		adev->doorbell.num_doorbells *= 2;



	adev->doorbell.ptr = ioremap(adev->doorbell.base,

				     adev->doorbell.num_doorbells *

				     sizeof(u32));

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

+19 −9
Original line number Diff line number Diff line
@@ -1502,18 +1502,15 @@ static int sdma_v4_0_sw_init(void *handle) 
		ring->ring_obj = NULL;

		ring->use_doorbell = true;



		DRM_INFO("use_doorbell being set to: [%s]\n",

				ring->use_doorbell?"true":"false");



		/* doorbell size is 2 dwords, get DWORD offset */

		if (adev->asic_type == CHIP_VEGA10)

			ring->doorbell_index = (i == 0) ?

				(AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset

				: (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 << 1); // get DWORD offset

				(AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1)

				: (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 << 1);

		else

			ring->doorbell_index = (i == 0) ?

				(AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset

				: (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1); // get DWORD offset



				(AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1)

				: (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1);



		sprintf(ring->name, "sdma%d", i);

		r = amdgpu_ring_init(adev, ring, 1024,
@@ -1527,7 +1524,20 @@ static int sdma_v4_0_sw_init(void *handle) 
		if (adev->sdma.has_page_queue) {

			ring = &adev->sdma.instance[i].page;

			ring->ring_obj = NULL;

			ring->use_doorbell = false;

			ring->use_doorbell = true;



			/* paging queue use same doorbell index/routing as gfx queue

			 * with 0x400 (4096 dwords) offset on second doorbell page

			 */

			if (adev->asic_type == CHIP_VEGA10)

				ring->doorbell_index = (i == 0) ?

					(AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1)

					: (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 << 1);

			else

				ring->doorbell_index = (i == 0) ?

					(AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1)

					: (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1);

			ring->doorbell_index += 0x400;



			sprintf(ring->name, "page%d", i);

			r = amdgpu_ring_init(adev, ring, 1024,

CRA Git | Maintained and supported by SUSTech CRA and CCSE