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

sna: Avoid overlapping gpu/cpu damage with IGNORE_CPU 

We cannot simply ignore the presence of CPU damage with IGNORE_CPU but
must remember to discard it.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-07-30 11:14:58 +01:00
parent c9805ba987
commit e6cb5d93ea
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/sna/sna_accel.c
View File

@ -2333,7 +2333,7 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
flags |= PREFER_GPU;
if (priv->shm)
flags = 0;
if (priv->cpu && (flags & (IGNORE_CPU | FORCE_GPU)) == 0)
if (priv->cpu && (flags & FORCE_GPU) == 0)
flags = 0;
if (!flags && (!priv->gpu_damage || !kgem_bo_is_busy(priv->gpu_bo)))
@ -2395,7 +2395,7 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
region.extents.x2, region.extents.y2));
if (priv->gpu_damage) {
if (flags & IGNORE_CPU || !priv->cpu_damage) {
if (!priv->cpu_damage) {
if (sna_damage_contains_box__no_reduce(priv->gpu_damage,
&region.extents)) {
DBG(("%s: region wholly contained within GPU damage\n",
@ -2444,7 +2444,7 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
move_to_gpu:
if (!sna_pixmap_move_area_to_gpu(pixmap, &region.extents,
MOVE_READ | MOVE_WRITE)) {
flags & IGNORE_CPU ? MOVE_WRITE : MOVE_READ | MOVE_WRITE)) {
DBG(("%s: failed to move-to-gpu, fallback\n", __FUNCTION__));
assert(priv->gpu_bo == NULL);
goto use_cpu_bo;
@ -11400,17 +11400,18 @@ sna_poly_fill_rect(DrawablePtr draw, GCPtr gc, int n, xRectangle *rect)
sna_damage_destroy(&priv->cpu_damage);
list_del(&priv->list);
}
hint |= IGNORE_CPU;
}
if (region_subsumes_drawable(&region, &pixmap->drawable) ||
box_inplace(pixmap, &region.extents)) {
if (priv->cpu_damage == NULL &&
(region_subsumes_drawable(&region, &pixmap->drawable) ||
box_inplace(pixmap, &region.extents))) {
DBG(("%s: promoting to full GPU\n", __FUNCTION__));
if (priv->gpu_bo && priv->cpu_damage == NULL) {
if (priv->gpu_bo) {
sna_damage_all(&priv->gpu_damage,
pixmap->drawable.width,
pixmap->drawable.height);
priv->undamaged = false;
}
hint |= IGNORE_CPU;
}
if (priv->cpu_damage == NULL) {
DBG(("%s: dropping last-cpu hint\n", __FUNCTION__));

3
src/sna/sna_composite.c
View File

@ -832,7 +832,8 @@ sna_composite_rectangles(CARD8 op,
priv->cpu = false;
}
hint |= IGNORE_CPU;
if (region.data == NULL)
hint |= IGNORE_CPU;
}
bo = sna_drawable_use_bo(&pixmap->drawable, hint,