Commit f9fdffa5 authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/radeon: fix cayman_vm_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 58f8cf56
...@@ -1538,26 +1538,31 @@ void cayman_vm_set_page(struct radeon_device *rdev, uint64_t pe, ...@@ -1538,26 +1538,31 @@ void cayman_vm_set_page(struct radeon_device *rdev, uint64_t pe,
{ {
struct radeon_ring *ring = &rdev->ring[rdev->asic->vm.pt_ring_index]; struct radeon_ring *ring = &rdev->ring[rdev->asic->vm.pt_ring_index];
uint32_t r600_flags = cayman_vm_page_flags(rdev, flags); uint32_t r600_flags = cayman_vm_page_flags(rdev, flags);
int i;
radeon_ring_write(ring, PACKET3(PACKET3_ME_WRITE, 1 + count * 2)); while (count) {
radeon_ring_write(ring, pe); unsigned ndw = 1 + count * 2;
radeon_ring_write(ring, upper_32_bits(pe) & 0xff); if (ndw > 0x3FFF)
for (i = 0; i < count; ++i) { ndw = 0x3FFF;
uint64_t value = 0;
if (flags & RADEON_VM_PAGE_SYSTEM) { radeon_ring_write(ring, PACKET3(PACKET3_ME_WRITE, ndw));
value = radeon_vm_map_gart(rdev, addr); radeon_ring_write(ring, pe);
value &= 0xFFFFFFFFFFFFF000ULL; radeon_ring_write(ring, upper_32_bits(pe) & 0xff);
addr += incr; for (; ndw > 1; ndw -= 2, --count, pe += 8) {
uint64_t value = 0;
} else if (flags & RADEON_VM_PAGE_VALID) { if (flags & RADEON_VM_PAGE_SYSTEM) {
value = addr; value = radeon_vm_map_gart(rdev, addr);
addr += incr; value &= 0xFFFFFFFFFFFFF000ULL;
} addr += incr;
} else if (flags & RADEON_VM_PAGE_VALID) {
value = addr;
addr += incr;
}
value |= r600_flags; value |= r600_flags;
radeon_ring_write(ring, value); radeon_ring_write(ring, value);
radeon_ring_write(ring, upper_32_bits(value)); radeon_ring_write(ring, upper_32_bits(value));
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment