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

sna: Avoid operating inplace if we have pending CPU damage 

If the operation does not replace existing CPU damage, we are likely to
want to reuse the pixmap again on the CPU, so avoid mixing CPU/GPU
operations.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-01-05 14:20:55 +00:00
parent f5d02d90f3
commit ce93c00a33
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/sna/sna_accel.c
View File

@ -870,9 +870,29 @@ static inline bool region_inplace(struct sna *sna,
if (wedged(sna))
return false;
if (priv->mapped)
if (priv->mapped) {
DBG(("%s: already mapped\n", __FUNCTION__));
return true;
}
if (priv->cpu_damage) {
const BoxRec *extents = &region->extents;
const BoxRec *damage = &priv->cpu_damage->extents;
if (extents->x2 < damage->x2 || extents->x1 > damage->x1 ||
extents->y2 < damage->y2 || extents->y1 > damage->y1) {
DBG(("%s: uncovered CPU damage pending\n", __FUNCTION__));
return false;
}
}
DBG(("%s: (%dx%d), inplace? %d\n",
__FUNCTION__,
region->extents.x2 - region->extents.x1,
region->extents.y2 - region->extents.y1,
((region->extents.x2 - region->extents.x1) *
(region->extents.y2 - region->extents.y1) *
pixmap->drawable.bitsPerPixel >> 12)
>= sna->kgem.half_cpu_cache_pages));
return ((region->extents.x2 - region->extents.x1) *
(region->extents.y2 - region->extents.y1) *
pixmap->drawable.bitsPerPixel >> 12)