xf86-video-intel: 2 commits - src/intel_driver.c src/sna/sna_accel.c src/sna/sna_damage.c src/sna/sna_display.c src/sna/sna_glyphs.c src/sna/sna_tiling.c
Chris Wilson
ickle at kemper.freedesktop.org
Fri Jan 18 05:20:59 PST 2013
src/intel_driver.c | 19 +++++++---
src/sna/sna_accel.c | 92 +++++++++++++++++++++++++-------------------------
src/sna/sna_damage.c | 6 +--
src/sna/sna_display.c | 2 -
src/sna/sna_glyphs.c | 2 -
src/sna/sna_tiling.c | 4 +-
6 files changed, 67 insertions(+), 58 deletions(-)
New commits:
commit 828a3a80aa3f0692e7be2831d58bccf02e2c481d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jan 18 13:16:23 2013 +0000
uxa: Clip dirty region to slave pixmap before appending damage
Fixes regression from
commit c789d06cf8a0debc67058d7be1483f5b542e2baa
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Jan 7 13:57:21 2013 +1000
intel: fixup damage posting to be done correctly around slave pixmap
which causes the entire slave scanout to be readback from uncached
memory every time a pixel is modified.
Reported-by: Stephen Liang <inteldriver at angrywalls.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59539
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel_driver.c b/src/intel_driver.c
index d22c063..7807106 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -686,7 +686,7 @@ void IntelEmitInvarientState(ScrnInfoPtr scrn)
}
#ifdef INTEL_PIXMAP_SHARING
-static Bool
+static void
redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
@@ -695,9 +695,19 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
int was_blocked;
PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
-
+ RegionTranslate(&pixregion, dirty->x, dirty->y);
+ RegionIntersect(&pixregion, &pixregion, DamageRegion(dirty->damage));
+ RegionTranslate(&pixregion, -dirty->x, -dirty->y);
+ was_blocked = RegionNil(&pixregion);
DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
+ RegionUninit(&pixregion);
+ if (was_blocked)
+ return;
+
+ PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
PixmapSyncDirtyHelper(dirty, &pixregion);
+ RegionUninit(&pixregion);
+
intel_batch_submit(scrn);
if (!intel->has_prime_vmap_flush) {
drm_intel_bo *bo = intel_get_pixmap_bo(dirty->slave_dst->master_pixmap);
@@ -706,10 +716,9 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
drm_intel_bo_unmap(bo);
xf86UnblockSIGIO(was_blocked);
}
- DamageRegionProcessPending(&dirty->slave_dst->drawable);
- RegionUninit(&pixregion);
- return 0;
+ DamageRegionProcessPending(&dirty->slave_dst->drawable);
+ return;
}
static void
commit e17eaf540b614cdcb8f7349dd01852c3afc5ab05
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jan 18 13:09:36 2013 +0000
sna: Replace double negative '!RegionNotEmpty' with the equivalent RegionNil
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 99063de..8539481 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -350,7 +350,7 @@ static void assert_pixmap_damage(PixmapPtr p)
_sna_damage_debug_get_region(DAMAGE_PTR(priv->cpu_damage), &cpu);
RegionIntersect(®, &cpu, &gpu);
- assert(!RegionNotEmpty(®));
+ assert(RegionNil(®));
RegionUninit(®);
RegionUninit(&gpu);
@@ -3766,7 +3766,7 @@ sna_put_image(DrawablePtr drawable, GCPtr gc, int depth,
gc->pCompositeClip->extents.x2 < region.extents.x2 ||
gc->pCompositeClip->extents.y2 < region.extents.y2) {
RegionIntersect(®ion, ®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
}
@@ -4713,7 +4713,7 @@ sna_do_copy(DrawablePtr src, DrawablePtr dst, GCPtr gc,
* VT is inactive, make sure the region isn't empty
*/
if (((WindowPtr)src)->parent ||
- !RegionNotEmpty(&((WindowPtr)src)->borderClip)) {
+ RegionNil(&((WindowPtr)src)->borderClip)) {
DBG(("%s: include inferiors\n", __FUNCTION__));
free_clip = clip = NotClippedByChildren((WindowPtr)src);
}
@@ -5376,7 +5376,7 @@ no_damage_clipped:
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
return true;
assert(dx + clip.extents.x1 >= 0);
@@ -5477,7 +5477,7 @@ damage_clipped:
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
return true;
assert(dx + clip.extents.x1 >= 0);
@@ -5798,7 +5798,7 @@ fallback:
DBG(("%s: fallback\n", __FUNCTION__));
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
if (!sna_gc_move_to_cpu(gc, drawable, ®ion))
@@ -5838,7 +5838,7 @@ sna_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
fallback:
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
if (!sna_gc_move_to_cpu(gc, drawable, ®ion))
@@ -6287,7 +6287,7 @@ sna_copy_plane(DrawablePtr src, DrawablePtr dst, GCPtr gc,
__FUNCTION__,
region.extents.x1, region.extents.y1,
region.extents.x2, region.extents.y2));
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
goto empty;
RegionTranslate(®ion,
@@ -6544,7 +6544,7 @@ fallback:
DBG(("%s: fallback\n", __FUNCTION__));
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
if (!sna_gc_move_to_cpu(gc, drawable, ®ion))
@@ -6599,7 +6599,7 @@ sna_poly_zero_line_blt(DrawablePtr drawable,
region_set(&clip, extents);
if (clipped) {
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
return true;
}
@@ -7024,7 +7024,7 @@ sna_poly_line_blt(DrawablePtr drawable,
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
return true;
last.x = pt->x + drawable->x;
@@ -7466,7 +7466,7 @@ spans_fallback:
} else {
region_maybe_clip(&data.region,
gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region))
+ if (RegionNil(&data.region))
return;
if (region_is_singular(&data.region))
@@ -7491,7 +7491,7 @@ spans_fallback:
} else {
region_maybe_clip(&data.region,
gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region))
+ if (RegionNil(&data.region))
return;
if (region_is_singular(&data.region))
@@ -7568,7 +7568,7 @@ spans_fallback:
fallback:
DBG(("%s: fallback\n", __FUNCTION__));
region_maybe_clip(&data.region, gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region))
+ if (RegionNil(&data.region))
return;
if (!sna_gc_move_to_cpu(gc, drawable, &data.region))
@@ -7698,7 +7698,7 @@ sna_poly_segment_blt(DrawablePtr drawable,
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
goto done;
if (clip.data) {
@@ -7805,7 +7805,7 @@ sna_poly_zero_segment_blt(DrawablePtr drawable,
region_set(&clip, extents);
if (clipped) {
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
return true;
}
DBG(("%s: [clipped] extents=(%d, %d), (%d, %d), delta=(%d, %d)\n",
@@ -8373,7 +8373,7 @@ spans_fallback:
} else {
region_maybe_clip(&data.region,
gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region))
+ if (RegionNil(&data.region))
return;
if (region_is_singular(&data.region))
@@ -8412,7 +8412,7 @@ spans_fallback:
fallback:
DBG(("%s: fallback\n", __FUNCTION__));
region_maybe_clip(&data.region, gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region))
+ if (RegionNil(&data.region))
return;
if (!sna_gc_move_to_cpu(gc, drawable, &data.region))
@@ -8567,7 +8567,7 @@ zero_clipped:
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
goto done;
if (clip.data) {
@@ -8713,7 +8713,7 @@ wide_clipped:
__FUNCTION__,
clip.extents.x1, clip.extents.y1,
clip.extents.x2, clip.extents.y2));
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
goto done;
if (clip.data) {
@@ -9022,7 +9022,7 @@ fallback:
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
if (!sna_gc_move_to_cpu(gc, drawable, ®ion))
@@ -9161,7 +9161,7 @@ sna_poly_arc(DrawablePtr drawable, GCPtr gc, int n, xArc *arc)
} else {
region_maybe_clip(&data.region,
gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region))
+ if (RegionNil(&data.region))
return;
if (region_is_singular(&data.region)) {
@@ -9185,7 +9185,7 @@ sna_poly_arc(DrawablePtr drawable, GCPtr gc, int n, xArc *arc)
} else {
region_maybe_clip(&data.region,
gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region))
+ if (RegionNil(&data.region))
return;
sna_gc_ops__tmp.FillSpans = sna_fill_spans__gpu;
@@ -9221,7 +9221,7 @@ sna_poly_arc(DrawablePtr drawable, GCPtr gc, int n, xArc *arc)
fallback:
DBG(("%s -- fallback\n", __FUNCTION__));
region_maybe_clip(&data.region, gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region))
+ if (RegionNil(&data.region))
return;
if (!sna_gc_move_to_cpu(gc, drawable, &data.region))
@@ -9364,7 +9364,7 @@ sna_poly_fill_rect_blt(DrawablePtr drawable,
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
goto done;
if (clip.data == NULL) {
@@ -9535,7 +9535,7 @@ sna_poly_fill_polygon(DrawablePtr draw, GCPtr gc,
} else {
region_maybe_clip(&data.region,
gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region))
+ if (RegionNil(&data.region))
return;
if (region_is_singular(&data.region))
@@ -9572,7 +9572,7 @@ fallback:
data.region.extents.x1, data.region.extents.y1,
data.region.extents.x2, data.region.extents.y2));
region_maybe_clip(&data.region, gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region)) {
+ if (RegionNil(&data.region)) {
DBG(("%s: nothing to do, all clipped\n", __FUNCTION__));
return;
}
@@ -9782,7 +9782,7 @@ sna_poly_fill_rect_tiled_8x8_blt(DrawablePtr drawable,
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
goto done;
b = sna->kgem.batch + sna->kgem.nbatch;
@@ -10109,7 +10109,7 @@ sna_poly_fill_rect_tiled_blt(DrawablePtr drawable,
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
goto done;
if (clip.data == NULL) {
@@ -10388,7 +10388,7 @@ sna_poly_fill_rect_stippled_8x8_blt(DrawablePtr drawable,
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
return true;
b = sna->kgem.batch + sna->kgem.nbatch;
@@ -10720,7 +10720,7 @@ sna_poly_fill_rect_stippled_1_blt(DrawablePtr drawable,
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip))
+ if (RegionNil(&clip))
return true;
pat.x = origin->x + drawable->x;
@@ -11329,7 +11329,7 @@ sna_poly_fill_rect_stippled_n_blt__imm(DrawablePtr drawable,
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip)) {
+ if (RegionNil(&clip)) {
DBG(("%s: all clipped\n", __FUNCTION__));
return true;
}
@@ -11474,7 +11474,7 @@ sna_poly_fill_rect_stippled_n_blt(DrawablePtr drawable,
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (!RegionNotEmpty(&clip)) {
+ if (RegionNil(&clip)) {
DBG(("%s: all clipped\n", __FUNCTION__));
return true;
}
@@ -11812,7 +11812,7 @@ fallback:
region.extents.x2, region.extents.y2));
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion)) {
+ if (RegionNil(®ion)) {
DBG(("%s: nothing to do, all clipped\n", __FUNCTION__));
return;
}
@@ -11905,7 +11905,7 @@ sna_poly_fill_arc(DrawablePtr draw, GCPtr gc, int n, xArc *arc)
} else {
region_maybe_clip(&data.region,
gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region))
+ if (RegionNil(&data.region))
return;
if (region_is_singular(&data.region))
@@ -11942,7 +11942,7 @@ fallback:
data.region.extents.x1, data.region.extents.y1,
data.region.extents.x2, data.region.extents.y2));
region_maybe_clip(&data.region, gc->pCompositeClip);
- if (!RegionNotEmpty(&data.region)) {
+ if (RegionNil(&data.region)) {
DBG(("%s: nothing to do, all clipped\n", __FUNCTION__));
return;
}
@@ -12399,7 +12399,7 @@ sna_poly_text8(DrawablePtr drawable, GCPtr gc,
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return x + extents.overallRight;
if (FORCE_FALLBACK)
@@ -12473,7 +12473,7 @@ sna_poly_text16(DrawablePtr drawable, GCPtr gc,
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return x + extents.overallRight;
if (FORCE_FALLBACK)
@@ -12554,7 +12554,7 @@ sna_image_text8(DrawablePtr drawable, GCPtr gc,
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
DBG(("%s: clipped extents (%d, %d), (%d, %d)\n",
@@ -12636,7 +12636,7 @@ sna_image_text16(DrawablePtr drawable, GCPtr gc,
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
DBG(("%s: clipped extents (%d, %d), (%d, %d)\n",
@@ -12938,7 +12938,7 @@ sna_image_glyph(DrawablePtr drawable, GCPtr gc,
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
if (FORCE_FALLBACK)
@@ -13016,7 +13016,7 @@ sna_poly_glyph(DrawablePtr drawable, GCPtr gc,
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
if (FORCE_FALLBACK)
@@ -13217,7 +13217,7 @@ sna_push_pixels(GCPtr gc, PixmapPtr bitmap, DrawablePtr drawable,
region.data = NULL;
region_maybe_clip(®ion, gc->pCompositeClip);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
switch (gc->fillStyle) {
@@ -13529,7 +13529,7 @@ sna_copy_window(WindowPtr win, DDXPointRec origin, RegionPtr src)
RegionNull(&dst);
RegionIntersect(&dst, &win->borderClip, src);
- if (!RegionNotEmpty(&dst))
+ if (RegionNil(&dst))
return;
#ifdef COMPOSITE
@@ -13800,7 +13800,7 @@ static void sna_accel_post_damage(struct sna *sna)
int n;
damage = DamageRegion(dirty->damage);
- if (!RegionNotEmpty(damage))
+ if (RegionNil(damage))
continue;
src = dirty->src;
@@ -13821,7 +13821,7 @@ static void sna_accel_post_damage(struct sna *sna)
region.extents.x2, region.extents.y2));
RegionIntersect(®ion, ®ion, damage);
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
continue;
RegionTranslate(®ion, -dirty->x, -dirty->y);
diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c
index 73d94e1..ab693af 100644
--- a/src/sna/sna_damage.c
+++ b/src/sna/sna_damage.c
@@ -1034,7 +1034,7 @@ static struct sna_damage *__sna_damage_subtract(struct sna_damage *damage,
if (damage == NULL)
return NULL;
- if (!RegionNotEmpty(&damage->region)) {
+ if (RegionNil(&damage->region)) {
no_damage:
__sna_damage_destroy(damage);
return NULL;
@@ -1127,7 +1127,7 @@ inline static struct sna_damage *__sna_damage_subtract_box(struct sna_damage *da
if (damage == NULL)
return NULL;
- if (!RegionNotEmpty(&damage->region)) {
+ if (RegionNil(&damage->region)) {
__sna_damage_destroy(damage);
return NULL;
}
@@ -1199,7 +1199,7 @@ static struct sna_damage *__sna_damage_subtract_boxes(struct sna_damage *damage,
if (damage == NULL)
return NULL;
- if (!RegionNotEmpty(&damage->region)) {
+ if (RegionNil(&damage->region)) {
__sna_damage_destroy(damage);
return NULL;
}
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 4ff4d8f..0a581da 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3203,7 +3203,7 @@ void sna_mode_redisplay(struct sna *sna)
assert(sna->mode.shadow_active);
region = DamageRegion(sna->mode.shadow_damage);
- if (!RegionNotEmpty(region))
+ if (RegionNil(region))
return;
if (!sna_pixmap_move_to_gpu(sna->front, MOVE_READ)) {
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 6225397..130c1ea 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -1357,7 +1357,7 @@ glyphs_fallback(CARD8 op,
__FUNCTION__,
RegionExtents(®ion)->x1, RegionExtents(®ion)->y1,
RegionExtents(®ion)->x2, RegionExtents(®ion)->y2));
- if (!RegionNotEmpty(®ion))
+ if (RegionNil(®ion))
return;
if (!sna_drawable_move_region_to_cpu(dst->pDrawable, ®ion,
diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c
index 9e70833..5bebf00 100644
--- a/src/sna/sna_tiling.c
+++ b/src/sna/sna_tiling.c
@@ -624,7 +624,7 @@ sna_tiling_fill_boxes(struct sna *sna,
RegionNull(&this);
RegionIntersect(&this, ®ion, &tile);
- if (!RegionNotEmpty(&this))
+ if (RegionNil(&this))
continue;
tmp.drawable.width = this.extents.x2 - this.extents.x1;
@@ -737,7 +737,7 @@ bool sna_tiling_blt_copy_boxes(struct sna *sna, uint8_t alu,
RegionNull(&this);
RegionIntersect(&this, ®ion, &tile);
- if (!RegionNotEmpty(&this))
+ if (RegionNil(&this))
continue;
w = this.extents.x2 - this.extents.x1;
More information about the xorg-commit
mailing list