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

sna: Avoid reducing damage for synchronisation 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-05-02 21:09:27 +01:00
parent f4c34e9ab3
commit 01c26a44fd
3 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sna/sna_accel.c
View File

@ -1523,9 +1523,10 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
priv->undamaged = true;
}
if (sna_damage_contains_box(priv->gpu_damage,
&region->extents) != PIXMAN_REGION_OUT) {
DBG(("%s: region (%dx%d) intersects gpu damage\n",
if (priv->gpu_damage &&
(DAMAGE_IS_ALL(priv->gpu_damage) ||
sna_damage_overlaps_box(priv->gpu_damage, &region->extents))) {
DBG(("%s: region (%dx%d) overlaps gpu damage\n",
__FUNCTION__,
region->extents.x2 - region->extents.x1,
region->extents.y2 - region->extents.y1));
@ -1538,9 +1539,18 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
priv->gpu_bo, 0, 0,
pixmap, 0, 0,
&region->extents, 1);
} else {
goto done;
}
if (sna_damage_contains_box(priv->gpu_damage,
&region->extents) != PIXMAN_REGION_OUT) {
RegionRec want, *r = region;
DBG(("%s: region (%dx%d) intersects gpu damage\n",
__FUNCTION__,
region->extents.x2 - region->extents.x1,
region->extents.y2 - region->extents.y1));
/* Expand the region to move 32x32 pixel blocks at a
* time, as we assume that we will continue writing
* afterwards and so aim to coallesce subsequent

24
src/sna/sna_damage.c
View File

@ -984,20 +984,6 @@ static bool box_contains(const BoxRec *a, const BoxRec *b)
return true;
}
static inline Bool sna_damage_maybe_contains_box(const struct sna_damage *damage,
const BoxRec *box)
{
if (box->x2 <= damage->extents.x1 ||
box->x1 >= damage->extents.x2)
return FALSE;
if (box->y2 <= damage->extents.y1 ||
box->y1 >= damage->extents.y2)
return FALSE;
return TRUE;
}
static struct sna_damage *__sna_damage_subtract(struct sna_damage *damage,
RegionPtr region)
{
@ -1011,7 +997,7 @@ static struct sna_damage *__sna_damage_subtract(struct sna_damage *damage,
assert(RegionNotEmpty(region));
if (!sna_damage_maybe_contains_box(damage, &region->extents))
if (!sna_damage_overlaps_box(damage, &region->extents))
return damage;
@ -1096,7 +1082,7 @@ inline static struct sna_damage *__sna_damage_subtract_box(struct sna_damage *da
return NULL;
}
if (!sna_damage_maybe_contains_box(damage, box))
if (!sna_damage_overlaps_box(damage, box))
return damage;
if (box_contains(box, &damage->extents)) {
@ -1189,7 +1175,7 @@ static struct sna_damage *__sna_damage_subtract_boxes(struct sna_damage *damage,
extents.y1 += dy;
extents.y2 += dy;
if (!sna_damage_maybe_contains_box(damage, &extents))
if (!sna_damage_overlaps_box(damage, &extents))
return damage;
if (n == 1)
@ -1248,7 +1234,7 @@ static int __sna_damage_contains_box(struct sna_damage *damage,
if (damage->mode == DAMAGE_ALL)
return PIXMAN_REGION_IN;
if (!sna_damage_maybe_contains_box(damage, box))
if (!sna_damage_overlaps_box(damage, box))
return PIXMAN_REGION_OUT;
ret = pixman_region_contains_rectangle(&damage->region, (BoxPtr)box);
@ -1297,7 +1283,7 @@ bool _sna_damage_contains_box__no_reduce(const struct sna_damage *damage,
if (damage->mode == DAMAGE_SUBTRACT)
return false;
if (!sna_damage_maybe_contains_box(damage, box))
if (!sna_damage_overlaps_box(damage, box))
return false;
return pixman_region_contains_rectangle((RegionPtr)&damage->region,

15
src/sna/sna_damage.h
View File

@ -190,6 +190,21 @@ static inline Bool sna_damage_intersect(struct sna_damage *damage,
return _sna_damage_intersect(damage, region, result);
}
static inline bool
sna_damage_overlaps_box(const struct sna_damage *damage,
const BoxRec *box)
{
if (box->x2 <= damage->extents.x1 ||
box->x1 >= damage->extents.x2)
return FALSE;
if (box->y2 <= damage->extents.y1 ||
box->y1 >= damage->extents.y2)
return FALSE;
return TRUE;
}
int _sna_damage_contains_box(struct sna_damage *damage,
const BoxRec *box);
static inline int sna_damage_contains_box(struct sna_damage *damage,