|
@@ -79,7 +79,25 @@ void si_dma_vm_set_page(struct radeon_device *rdev,
|
|
|
|
|
|
trace_radeon_vm_set_page(pe, addr, count, incr, flags);
|
|
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 > 0xFFFF8)
|
|
|
|
+ bytes = 0xFFFF8;
|
|
|
|
+
|
|
|
|
+ ib->ptr[ib->length_dw++] = DMA_PACKET(DMA_PACKET_COPY,
|
|
|
|
+ 1, 0, 0, bytes);
|
|
|
|
+ ib->ptr[ib->length_dw++] = pe & 0xffffffff;
|
|
|
|
+ ib->ptr[ib->length_dw++] = src & 0xffffffff;
|
|
|
|
+ ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff;
|
|
|
|
+ ib->ptr[ib->length_dw++] = upper_32_bits(src) & 0xff;
|
|
|
|
+
|
|
|
|
+ pe += bytes;
|
|
|
|
+ src += bytes;
|
|
|
|
+ count -= bytes / 8;
|
|
|
|
+ }
|
|
|
|
+ } else if (flags & R600_PTE_SYSTEM) {
|
|
while (count) {
|
|
while (count) {
|
|
ndw = count * 2;
|
|
ndw = count * 2;
|
|
if (ndw > 0xFFFFE)
|
|
if (ndw > 0xFFFFE)
|