78,11 → 78,9 |
int r; |
|
if (rdev->gart.table.vram.robj == NULL) { |
r = radeon_object_create(rdev, NULL, |
rdev->gart.table_size, |
true, |
RADEON_GEM_DOMAIN_VRAM, |
false, &rdev->gart.table.vram.robj); |
r = radeon_bo_create(rdev, NULL, rdev->gart.table_size, |
true, RADEON_GEM_DOMAIN_VRAM, |
&rdev->gart.table.vram.robj); |
if (r) { |
return r; |
} |
95,48 → 93,42 |
uint64_t gpu_addr; |
int r; |
|
r = radeon_object_pin(rdev->gart.table.vram.robj, |
r = radeon_bo_reserve(rdev->gart.table.vram.robj, false); |
if (unlikely(r != 0)) |
return r; |
r = radeon_bo_pin(rdev->gart.table.vram.robj, |
RADEON_GEM_DOMAIN_VRAM, &gpu_addr); |
if (r) { |
// radeon_object_unref(&rdev->gart.table.vram.robj); |
radeon_bo_unreserve(rdev->gart.table.vram.robj); |
return r; |
} |
r = radeon_object_kmap(rdev->gart.table.vram.robj, |
r = radeon_bo_kmap(rdev->gart.table.vram.robj, |
(void **)&rdev->gart.table.vram.ptr); |
if (r) { |
// radeon_object_unpin(rdev->gart.table.vram.robj); |
// radeon_object_unref(&rdev->gart.table.vram.robj); |
DRM_ERROR("radeon: failed to map gart vram table.\n"); |
if (r) |
radeon_bo_unpin(rdev->gart.table.vram.robj); |
radeon_bo_unreserve(rdev->gart.table.vram.robj); |
rdev->gart.table_addr = gpu_addr; |
return r; |
} |
|
rdev->gart.table_addr = gpu_addr; |
|
dbgprintf("alloc gart vram: gpu_base %x lin_addr %x\n", |
rdev->gart.table_addr, rdev->gart.table.vram.ptr); |
|
// gpu_addr = 0x800000; |
|
// u32_t pci_addr = rdev->mc.aper_base + gpu_addr; |
|
// rdev->gart.table.vram.ptr = (void*)MapIoMem(pci_addr, rdev->gart.table_size, PG_SW); |
|
|
// dbgprintf("alloc gart vram:\n gpu_base %x pci_base %x lin_addr %x", |
// gpu_addr, pci_addr, rdev->gart.table.vram.ptr); |
|
return 0; |
} |
|
void radeon_gart_table_vram_free(struct radeon_device *rdev) |
{ |
int r; |
|
if (rdev->gart.table.vram.robj == NULL) { |
return; |
} |
// radeon_object_kunmap(rdev->gart.table.vram.robj); |
// radeon_object_unpin(rdev->gart.table.vram.robj); |
// radeon_object_unref(&rdev->gart.table.vram.robj); |
r = radeon_bo_reserve(rdev->gart.table.vram.robj, false); |
if (likely(r == 0)) { |
radeon_bo_kunmap(rdev->gart.table.vram.robj); |
radeon_bo_unpin(rdev->gart.table.vram.robj); |
radeon_bo_unreserve(rdev->gart.table.vram.robj); |
} |
radeon_bo_unref(&rdev->gart.table.vram.robj); |
} |
|
|
|
152,7 → 144,7 |
int i, j; |
|
if (!rdev->gart.ready) { |
// WARN(1, "trying to unbind memory to unitialized GART !\n"); |
WARN(1, "trying to unbind memory to unitialized GART !\n"); |
return; |
} |
t = offset / RADEON_GPU_PAGE_SIZE; |
234,13 → 226,13 |
rdev->gart.pages = kzalloc(sizeof(void *) * rdev->gart.num_cpu_pages, |
GFP_KERNEL); |
if (rdev->gart.pages == NULL) { |
// radeon_gart_fini(rdev); |
radeon_gart_fini(rdev); |
return -ENOMEM; |
} |
rdev->gart.pages_addr = kzalloc(sizeof(u32_t) * |
rdev->gart.pages_addr = kzalloc(sizeof(dma_addr_t) * |
rdev->gart.num_cpu_pages, GFP_KERNEL); |
if (rdev->gart.pages_addr == NULL) { |
// radeon_gart_fini(rdev); |
radeon_gart_fini(rdev); |
return -ENOMEM; |
} |
return 0; |