50,7 → 50,7 |
{ |
int r = 0; |
|
dbgprintf("%s\n",__FUNCTION__); |
ENTER(); |
|
r = drm_mm_init(&mm_vram, 0x800000 >> PAGE_SHIFT, |
((rdev->mc.aper_size - 0x800000) >> PAGE_SHIFT)); |
101,8 → 101,6 |
uint32_t flags; |
int r; |
|
dbgprintf("%s\n",__FUNCTION__); |
|
if (kernel) { |
type = ttm_bo_type_kernel; |
} else { |
121,8 → 119,6 |
|
robj->flags = flags; |
|
dbgprintf("robj flags %x\n", robj->flags); |
|
if( flags & TTM_PL_FLAG_VRAM) |
{ |
size_t num_pages; |
132,7 → 128,7 |
num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; |
|
if (num_pages == 0) { |
printk("Illegal buffer object size.\n"); |
dbgprintf("Illegal buffer object size.\n"); |
return -EINVAL; |
} |
retry_pre_get: |
170,7 → 166,7 |
num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; |
|
if (num_pages == 0) { |
printk("Illegal buffer object size.\n"); |
dbgprintf("Illegal buffer object size.\n"); |
return -EINVAL; |
} |
retry_pre_get1: |
223,8 → 219,6 |
uint32_t tmp; |
int r = 0; |
|
dbgprintf("%s\n",__FUNCTION__); |
|
// flags = radeon_object_flags_from_domain(domain); |
// spin_lock(&robj->tobj.lock); |
if (robj->pin_count) { |
280,8 → 274,6 |
DRM_ERROR("radeon: failed to pin object.\n"); |
} |
|
dbgprintf("done %s\n",__FUNCTION__); |
|
return r; |
} |
|
289,8 → 281,6 |
{ |
int r = 0; |
|
dbgprintf("%s\n",__FUNCTION__); |
|
// spin_lock(&robj->tobj.lock); |
if (robj->kptr) { |
if (ptr) { |
319,12 → 309,25 |
*ptr = robj->kptr; |
} |
|
dbgprintf("done %s\n",__FUNCTION__); |
|
return 0; |
} |
|
void radeon_object_kunmap(struct radeon_object *robj) |
{ |
// spin_lock(&robj->tobj.lock); |
if (robj->kptr == NULL) { |
// spin_unlock(&robj->tobj.lock); |
return; |
} |
|
if (robj->flags & TTM_PL_FLAG_VRAM) |
{ |
FreeKernelSpace(robj->kptr); |
robj->kptr = NULL; |
} |
// spin_unlock(&robj->tobj.lock); |
} |
|
#if 0 |
|
void radeon_object_unpin(struct radeon_object *robj) |