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

Commit 3d7938fa authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: optimize CIK VM handling v2 



Fill VM page tables from the GART page table if applicable.

v2: fix copy&paste error

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f3982ac1

drivers/gpu/drm/radeon/cik_sdma.c

+20 −1
Original line number Diff line number Diff line
@@ -741,7 +741,26 @@ void cik_sdma_vm_set_page(struct radeon_device *rdev, 


	trace_radeon_vm_set_page(pe, addr, count, incr, flags);



	if (flags & R600_PTE_SYSTEM) {

	if (flags == R600_PTE_GART) {

		uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;

		while (count) {

			unsigned bytes = count * 8;

			if (bytes > 0x1FFFF8)

				bytes = 0x1FFFF8;



			ib->ptr[ib->length_dw++] = SDMA_PACKET(SDMA_OPCODE_COPY, SDMA_WRITE_SUB_OPCODE_LINEAR, 0);

			ib->ptr[ib->length_dw++] = bytes;

			ib->ptr[ib->length_dw++] = 0; /* src/dst endian swap */

			ib->ptr[ib->length_dw++] = src & 0xffffffff;

			ib->ptr[ib->length_dw++] = upper_32_bits(src);

			ib->ptr[ib->length_dw++] = pe & 0xffffffff;

			ib->ptr[ib->length_dw++] = upper_32_bits(pe);



			pe += bytes;

			src += bytes;

			count -= bytes / 8;

		}

	} else if (flags & R600_PTE_SYSTEM) {

		while (count) {

			ndw = count * 2;

			if (ndw > 0xFFFFE)