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

sna: Tweak placement of operations 

Take in account busyness of the damaged GPU bo for considering placement
of the subsequent operations. In particular, note that is_cpu is only
used for when we feel like the following operation would be better on
the CPU and just want to confirm that doing so will not stall.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-06-16 12:55:54 +01:00
parent 8eac098962
commit eaed58b2ba
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sna/sna_accel.c
View File

@ -1282,17 +1282,17 @@ static inline bool region_inplace(struct sna *sna,
if (wedged(sna))
return false;
if (priv->flush) {
DBG(("%s: yes, exported via dri, will flush\n", __FUNCTION__));
return true;
}
if (priv->cpu_damage &&
region_overlaps_damage(region, priv->cpu_damage)) {
DBG(("%s: no, uncovered CPU damage pending\n", __FUNCTION__));
return false;
}
if (priv->flush) {
DBG(("%s: yes, exported via dri, will flush\n", __FUNCTION__));
return true;
}
if (priv->mapped) {
DBG(("%s: yes, already mapped, continuiung\n", __FUNCTION__));
return true;

14
src/sna/sna_render_inline.h
View File

@ -75,7 +75,7 @@ is_gpu(DrawablePtr drawable)
if (priv == NULL || priv->clear)
return false;
if (priv->gpu_damage || (priv->gpu_bo && kgem_bo_is_busy(priv->gpu_bo) && !priv->gpu_bo->proxy))
if (DAMAGE_IS_ALL(priv->gpu_damage) || (priv->gpu_bo && kgem_bo_is_busy(priv->gpu_bo) && !priv->gpu_bo->proxy))
return true;
return priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo);
@ -85,10 +85,14 @@ static inline Bool
is_cpu(DrawablePtr drawable)
{
struct sna_pixmap *priv = sna_pixmap_from_drawable(drawable);
if (priv == NULL || priv->clear || DAMAGE_IS_ALL(priv->cpu_damage))
if (priv == NULL || priv->gpu_bo == NULL || priv->clear || DAMAGE_IS_ALL(priv->cpu_damage))
return true;
if (priv->gpu_damage || (priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo)))
assert(!priv->gpu_bo->proxy); /* should be marked as cpu damaged */
if (priv->gpu_damage && kgem_bo_is_busy(priv->gpu_bo));
return false;
if (priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo))
return false;
return true;
@ -106,7 +110,7 @@ too_small(struct sna_pixmap *priv)
{
assert(priv);
if (priv->gpu_damage)
if (priv->gpu_bo)
return false;
if (priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo))
@ -120,7 +124,7 @@ unattached(DrawablePtr drawable)
{
struct sna_pixmap *priv = sna_pixmap_from_drawable(drawable);
if (priv == NULL)
if (priv == NULL || DAMAGE_IS_ALL(priv->cpu_damage))
return true;
return priv->gpu_bo == NULL && priv->cpu_bo == NULL;