Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2cfabbd authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/sdma4: use paging queue for buffer funcs 



Use the paging queue for buffer functions to avoid contention
with the other queues.

Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Tested-by: default avatarChen Gong <Curry.Gong@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f0c9fabd

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

+11 −1
Original line number Diff line number Diff line
@@ -662,6 +662,10 @@ static void sdma_v4_0_page_stop(struct amdgpu_device *adev) 
	u32 rb_cntl, ib_cntl;

	int i;



	if ((adev->mman.buffer_funcs_ring == sdma0) ||

	    (adev->mman.buffer_funcs_ring == sdma1))

		amdgpu_ttm_set_buffer_funcs_status(adev, false);



	for (i = 0; i < adev->sdma.num_instances; i++) {

		rb_cntl = RREG32_SDMA(i, mmSDMA0_PAGE_RB_CNTL);

		rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_PAGE_RB_CNTL,
@@ -1152,6 +1156,9 @@ static int sdma_v4_0_start(struct amdgpu_device *adev) 
			r = amdgpu_ring_test_helper(page);

			if (r)

				return r;



			if (adev->mman.buffer_funcs_ring == page)

				amdgpu_ttm_set_buffer_funcs_status(adev, true);

		}



		if (adev->mman.buffer_funcs_ring == ring)
@@ -2057,6 +2064,9 @@ static const struct amdgpu_buffer_funcs sdma_v4_0_buffer_funcs = { 
static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev)

{

	adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs;

	if (adev->sdma.has_page_queue)

		adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].page;

	else

		adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;

}