sna: Also prefer to use the dst GPU bo if CopyArea reduces to an inplace upload

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-07-03 11:54:02 +01:00
parent dbe3a5ca1e
commit 2d087eadd9
1 changed files with 15 additions and 5 deletions

View File

@ -3716,16 +3716,24 @@ source_prefer_gpu(struct sna_pixmap *priv)
{
unsigned flags;
if (priv == NULL)
if (priv == NULL) {
DBG(("%s: source unattached, use cpu\n", __FUNCTION__));
return 0;
}
if (priv->gpu_damage)
if (priv->gpu_damage) {
DBG(("%s: source has gpu damage, force gpu\n", __FUNCTION__));
return PREFER_GPU | FORCE_GPU;
}
if (priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo))
if (priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo)) {
DBG(("%s: source has busy CPU bo, force gpu\n", __FUNCTION__));
return PREFER_GPU | FORCE_GPU;
}
return PREFER_GPU;
DBG(("%s: source has GPU bo? %d\n",
__FUNCTION__, priv->gpu_bo != NULL));
return priv->gpu_bo != NULL;
}
static void
@ -3811,7 +3819,9 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
}
bo = sna_drawable_use_bo(&dst_pixmap->drawable,
source_prefer_gpu(src_priv),
source_prefer_gpu(src_priv) ?:
region_inplace(sna, dst_pixmap, &region,
dst_priv, alu_overwrites(alu)),
&region.extents, &damage);
if (bo) {
if (src_priv && src_priv->clear) {