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

drm/radeon: fix si_set_page v2 



Handle requests that won't fit into a single packet.

v2: pe needs to increase as well.

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f9fdffa5

drivers/gpu/drm/radeon/si.c

+24 −19
Original line number Diff line number Diff line
@@ -2808,15 +2808,19 @@ void si_vm_set_page(struct radeon_device *rdev, uint64_t pe, 
{

	struct radeon_ring *ring = &rdev->ring[rdev->asic->vm.pt_ring_index];

	uint32_t r600_flags = cayman_vm_page_flags(rdev, flags);

	int i;

	uint64_t value;



	radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 2 + count * 2));

	while (count) {

		unsigned ndw = 2 + count * 2;

		if (ndw > 0x3FFE)

			ndw = 0x3FFE;



		radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, ndw));

		radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |

					 WRITE_DATA_DST_SEL(1)));

		radeon_ring_write(ring, pe);

		radeon_ring_write(ring, upper_32_bits(pe));

	for (i = 0; i < count; ++i) {

		for (; ndw > 2; ndw -= 2, --count, pe += 8) {

			uint64_t value;

			if (flags & RADEON_VM_PAGE_SYSTEM) {

				value = radeon_vm_map_gart(rdev, addr);

				value &= 0xFFFFFFFFFFFFF000ULL;
@@ -2830,6 +2834,7 @@ void si_vm_set_page(struct radeon_device *rdev, uint64_t pe, 
			radeon_ring_write(ring, upper_32_bits(value));

		}

	}

}



void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)

{