parent
c1fbd8a566
commit
09984ad77b
|
@ -345,6 +345,7 @@ static void drm_bo_destroy_locked(drm_buffer_object_t *bo)
|
||||||
drm_destroy_ttm(bo->ttm);
|
drm_destroy_ttm(bo->ttm);
|
||||||
bo->ttm = NULL;
|
bo->ttm = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
atomic_dec(&bm->count);
|
atomic_dec(&bm->count);
|
||||||
|
|
||||||
drm_ctl_free(bo, sizeof(*bo), DRM_MEM_BUFOBJ);
|
drm_ctl_free(bo, sizeof(*bo), DRM_MEM_BUFOBJ);
|
||||||
|
@ -571,6 +572,7 @@ static int drm_bo_evict(drm_buffer_object_t * bo, unsigned mem_type,
|
||||||
if (bo->priv_flags & _DRM_BO_FLAG_UNFENCED)
|
if (bo->priv_flags & _DRM_BO_FLAG_UNFENCED)
|
||||||
goto out;
|
goto out;
|
||||||
if (bo->mem.mem_type != mem_type)
|
if (bo->mem.mem_type != mem_type)
|
||||||
|
goto out;
|
||||||
|
|
||||||
ret = drm_bo_wait(bo, 0, 0, no_wait);
|
ret = drm_bo_wait(bo, 0, 0, no_wait);
|
||||||
|
|
||||||
|
@ -580,6 +582,9 @@ static int drm_bo_evict(drm_buffer_object_t * bo, unsigned mem_type,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (bo->type != drm_bo_type_dc)
|
||||||
|
goto out1;
|
||||||
|
|
||||||
evict_mem = bo->mem;
|
evict_mem = bo->mem;
|
||||||
evict_mem.mask = dev->driver->bo_driver->evict_flags(dev, mem_type);
|
evict_mem.mask = dev->driver->bo_driver->evict_flags(dev, mem_type);
|
||||||
ret = drm_bo_mem_space(dev, &evict_mem, no_wait);
|
ret = drm_bo_mem_space(dev, &evict_mem, no_wait);
|
||||||
|
@ -599,6 +604,7 @@ static int drm_bo_evict(drm_buffer_object_t * bo, unsigned mem_type,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
out1:
|
||||||
mutex_lock(&dev->struct_mutex);
|
mutex_lock(&dev->struct_mutex);
|
||||||
if (evict_mem.mm_node) {
|
if (evict_mem.mm_node) {
|
||||||
drm_mm_put_block(evict_mem.mm_node);
|
drm_mm_put_block(evict_mem.mm_node);
|
||||||
|
@ -674,6 +680,7 @@ static int drm_bo_mt_compatible(drm_mem_type_manager_t *man,
|
||||||
uint32_t *res_mask)
|
uint32_t *res_mask)
|
||||||
{
|
{
|
||||||
uint32_t cur_flags = drm_bo_type_flags(mem_type);
|
uint32_t cur_flags = drm_bo_type_flags(mem_type);
|
||||||
|
uint32_t flag_diff;
|
||||||
|
|
||||||
if (man->flags & _DRM_FLAG_MEMTYPE_CACHED)
|
if (man->flags & _DRM_FLAG_MEMTYPE_CACHED)
|
||||||
cur_flags |= DRM_BO_FLAG_CACHED;
|
cur_flags |= DRM_BO_FLAG_CACHED;
|
||||||
|
@ -682,13 +689,21 @@ static int drm_bo_mt_compatible(drm_mem_type_manager_t *man,
|
||||||
if (man->flags & _DRM_FLAG_MEMTYPE_CSELECT)
|
if (man->flags & _DRM_FLAG_MEMTYPE_CSELECT)
|
||||||
DRM_FLAG_MASKED(cur_flags, mask, DRM_BO_FLAG_CACHED);
|
DRM_FLAG_MASKED(cur_flags, mask, DRM_BO_FLAG_CACHED);
|
||||||
|
|
||||||
if (!(mask & DRM_BO_FLAG_FORCE_CACHING))
|
if ((cur_flags & mask & DRM_BO_MASK_MEM) == 0) {
|
||||||
DRM_FLAG_MASKED(mask, cur_flags, DRM_BO_FLAG_CACHED);
|
return 0;
|
||||||
if (!(mask & DRM_BO_FLAG_FORCE_MAPPABLE))
|
}
|
||||||
DRM_FLAG_MASKED(mask, cur_flags, DRM_BO_FLAG_MAPPABLE);
|
flag_diff = (mask ^ cur_flags);
|
||||||
|
if ((flag_diff & DRM_BO_FLAG_CACHED) &&
|
||||||
|
(mask & DRM_BO_FLAG_FORCE_CACHING)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if ((flag_diff & DRM_BO_FLAG_MAPPABLE) &&
|
||||||
|
(mask & DRM_BO_FLAG_FORCE_MAPPABLE)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
*res_mask = mask;
|
*res_mask = cur_flags;
|
||||||
return ((cur_flags & mask & DRM_BO_MASK_MEMTYPE) == cur_flags);
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -778,6 +793,16 @@ static int drm_bo_new_mask(drm_buffer_object_t *bo,
|
||||||
{
|
{
|
||||||
uint32_t new_props;
|
uint32_t new_props;
|
||||||
|
|
||||||
|
if (bo->type == drm_bo_type_user) {
|
||||||
|
DRM_ERROR("User buffers are not supported yet\n");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
if (bo->type == drm_bo_type_fake &&
|
||||||
|
!(new_mask & (DRM_BO_FLAG_NO_MOVE | DRM_BO_FLAG_NO_EVICT))) {
|
||||||
|
DRM_ERROR("Fake buffers must be pinned.\n");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
if ((new_mask & DRM_BO_FLAG_NO_EVICT) && !DRM_SUSER(DRM_CURPROC)) {
|
if ((new_mask & DRM_BO_FLAG_NO_EVICT) && !DRM_SUSER(DRM_CURPROC)) {
|
||||||
DRM_ERROR
|
DRM_ERROR
|
||||||
("DRM_BO_FLAG_NO_EVICT is only available to priviliged "
|
("DRM_BO_FLAG_NO_EVICT is only available to priviliged "
|
||||||
|
@ -785,7 +810,6 @@ static int drm_bo_new_mask(drm_buffer_object_t *bo,
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
new_props = new_mask & (DRM_BO_FLAG_EXE | DRM_BO_FLAG_WRITE |
|
new_props = new_mask & (DRM_BO_FLAG_EXE | DRM_BO_FLAG_WRITE |
|
||||||
DRM_BO_FLAG_READ);
|
DRM_BO_FLAG_READ);
|
||||||
|
|
||||||
|
@ -1220,6 +1244,43 @@ static int drm_bo_mem_compat(drm_bo_mem_reg_t *mem)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int drm_bo_check_fake(drm_device_t *dev, drm_bo_mem_reg_t *mem)
|
||||||
|
{
|
||||||
|
drm_buffer_manager_t *bm = &dev->bm;
|
||||||
|
drm_mem_type_manager_t *man;
|
||||||
|
uint32_t num_prios = dev->driver->bo_driver->num_mem_type_prio;
|
||||||
|
const uint32_t *prios = dev->driver->bo_driver->mem_type_prio;
|
||||||
|
uint32_t i;
|
||||||
|
int type_ok = 0;
|
||||||
|
uint32_t mem_type = 0;
|
||||||
|
uint32_t cur_flags;
|
||||||
|
|
||||||
|
if (drm_bo_mem_compat(mem))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
BUG_ON(mem->mm_node);
|
||||||
|
|
||||||
|
for (i=0; i<num_prios; ++i) {
|
||||||
|
mem_type = prios[i];
|
||||||
|
man = &bm->man[mem_type];
|
||||||
|
type_ok = drm_bo_mt_compatible(man, mem_type, mem->mask,
|
||||||
|
&cur_flags);
|
||||||
|
if (type_ok)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type_ok) {
|
||||||
|
mem->mm_node = NULL;
|
||||||
|
mem->mem_type = mem_type;
|
||||||
|
mem->flags = cur_flags;
|
||||||
|
DRM_FLAG_MASKED(mem->flags, mem->mask, ~DRM_BO_MASK_MEMTYPE);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
DRM_ERROR("Illegal fake buffer flags 0x%08x\n", mem->mask);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* bo locked.
|
* bo locked.
|
||||||
*/
|
*/
|
||||||
|
@ -1242,6 +1303,12 @@ static int drm_buffer_object_validate(drm_buffer_object_t * bo,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (bo->type == drm_bo_type_fake) {
|
||||||
|
ret = drm_bo_check_fake(dev, &bo->mem);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check whether we dropped no_move policy, and in that case,
|
* Check whether we dropped no_move policy, and in that case,
|
||||||
* release reserved manager regions, if we're evicted.
|
* release reserved manager regions, if we're evicted.
|
||||||
|
|
Loading…
Reference in New Issue