Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Check size against aperture before attempting to perform the GTT mapping 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-01-13 17:31:15 +00:00
parent 7a7db06c62
commit 3f04b0b98d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sna/sna_accel.c
View File

@ -1431,10 +1431,13 @@ static inline bool use_cpu_bo_for_upload(struct sna *sna,
static inline bool operate_inplace(struct sna_pixmap *priv, unsigned flags)
{
if ((flags & MOVE_INPLACE_HINT) == 0 || priv->gpu_bo == NULL)
if ((priv->create & KGEM_CAN_CREATE_GTT) == 0)
return false;
if (flags & MOVE_WRITE && kgem_bo_is_busy(priv->gpu_bo))
if ((flags & MOVE_INPLACE_HINT) == 0)
return false;
if (priv->gpu_damage && kgem_bo_is_busy(priv->gpu_bo))
return false;
return true;
@ -1541,7 +1544,7 @@ skip_inplace_map:
if (operate_inplace(priv, flags) &&
pixmap_inplace(sna, pixmap, priv) &&
sna_pixmap_move_to_gpu(pixmap, flags | MOVE_INPLACE_HINT)) {
sna_pixmap_move_to_gpu(pixmap, flags)) {
kgem_bo_submit(&sna->kgem, priv->gpu_bo);
DBG(("%s: try to operate inplace (GTT)\n", __FUNCTION__));
@ -2029,8 +2032,8 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
}
if (operate_inplace(priv, flags) &&
kgem_bo_can_map(&sna->kgem, priv->gpu_bo) &&
region_inplace(sna, pixmap, region, priv, (flags & MOVE_READ) == 0)) {
region_inplace(sna, pixmap, region, priv, (flags & MOVE_READ) == 0) &&
sna_pixmap_move_to_gpu(pixmap, flags | MOVE_READ)) {
kgem_bo_submit(&sna->kgem, priv->gpu_bo);
DBG(("%s: try to operate inplace\n", __FUNCTION__));