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

sna: Fast path move-area-to-cpu when the pixmap is already on the cpu 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-01-15 17:30:00 +00:00
parent 37ced44a53
commit 475fa67ed3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sna/sna_accel.c
View File

@ -1020,6 +1020,9 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
return true;
}
if (DAMAGE_IS_ALL(priv->cpu_damage))
goto out;
if (priv->stride == 0 && priv->gpu_bo == NULL && flags & MOVE_WRITE)
return _sna_pixmap_move_to_cpu(pixmap, flags);
@ -1035,9 +1038,6 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
return _sna_pixmap_move_to_cpu(pixmap, flags);
}
if (DAMAGE_IS_ALL(priv->cpu_damage))
goto done;
if ((flags & MOVE_READ) == 0) {
assert(flags == MOVE_WRITE);
@ -1292,11 +1292,6 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
}
done:
if (priv->cpu_bo) {
DBG(("%s: syncing cpu bo\n", __FUNCTION__));
kgem_bo_sync__cpu(&sna->kgem, priv->cpu_bo);
}
if (flags & MOVE_WRITE && !DAMAGE_IS_ALL(priv->cpu_damage)) {
DBG(("%s: applying cpu damage\n", __FUNCTION__));
assert_pixmap_contains_box(pixmap, RegionExtents(region));
@ -1315,6 +1310,11 @@ done:
if (dx | dy)
RegionTranslate(region, -dx, -dy);
out:
if (priv->cpu_bo) {
DBG(("%s: syncing cpu bo\n", __FUNCTION__));
kgem_bo_sync__cpu(&sna->kgem, priv->cpu_bo);
}
return true;
}