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

sna: Destroy the counter damage after a reduction-to-all 

If, for instance, we reduce the GPU damage to all we know that there can
be no CPU damage even though it may still have a region with a list of
subtractions. Take advantage of this knowledge and cheaply discard that
damage without having to evaluate it.

This should prevent a paranoid assertion that there is no cpu damage
when discarding the CPU bo for an active pixmap.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-01-10 09:13:34 +00:00
parent 4a255e1316
commit 572cc76be5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sna/sna_accel.c
View File

@ -298,9 +298,14 @@ static inline uint32_t default_tiling(PixmapPtr pixmap)
return I915_TILING_X;
}
return sna_damage_is_all(&priv->cpu_damage,
if (sna_damage_is_all(&priv->cpu_damage,
pixmap->drawable.width,
pixmap->drawable.height) ? I915_TILING_Y : sna->default_tiling;
pixmap->drawable.height)) {
sna_damage_destroy(&priv->gpu_damage);
return I915_TILING_Y;
}
return sna->default_tiling;
}
constant static uint32_t sna_pixmap_choose_tiling(PixmapPtr pixmap)
@ -1919,10 +1924,8 @@ sna_put_zpixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
if (!priv->pinned && priv->gpu_bo &&
region_subsumes_gpu_damage(region, priv) &&
kgem_bo_map_will_stall(&sna->kgem, priv->gpu_bo)) {
sna_damage_destroy(&priv->gpu_damage);
kgem_bo_map_will_stall(&sna->kgem, priv->gpu_bo))
sna_pixmap_free_gpu(sna, priv);
}
/* XXX performing the upload inplace is currently about 20x slower
* for putimage10 on gen6 -- mostly due to slow page faulting in kernel.
@ -9663,6 +9666,7 @@ static void sna_accel_inactive(struct sna *sna)
priv->pixmap->drawable.height)) {
DBG(("%s: discarding inactive CPU shadow\n",
__FUNCTION__));
sna_damage_destroy(&priv->cpu_damage);
sna_pixmap_free_cpu(sna, priv);
list_add(&priv->inactive, &preserve);
} else {