xf86-video-intel: 2 commits - src/sna/gen7_render.c src/sna/sna_accel.c

[Chris Wilson]

 src/sna/gen7_render.c |   11 ++++++-----
 src/sna/sna_accel.c   |    5 ++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit a683643ebf9120bd73a7cd740b5fb24f7e8e797b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Oct 3 14:13:13 2012 +0100

    sna: Fix an instance of undamaged tracking
    
    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 cbcdcf6..2fb5529 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2777,6 +2777,8 @@ done:
 			      pixmap->drawable.width,
 			      pixmap->drawable.height)) {
 		sna_damage_destroy(&priv->cpu_damage);
+		list_del(&priv->list);
+		priv->undamaged = false;
 		*damage = NULL;
 	} else
 		*damage = &priv->gpu_damage;
@@ -2998,7 +3000,8 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
 			      pixmap->drawable.height)) {
 		DBG(("%s: already all-damaged\n", __FUNCTION__));
 		sna_damage_destroy(&priv->cpu_damage);
-		priv->undamaged = true;
+		list_del(&priv->list);
+		priv->undamaged = false;
 		assert(priv->cpu == false);
 		goto active;
 	}
commit 47c76bb9680eee89d1cef86058782a7073ca4a47
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Oct 3 14:12:50 2012 +0100

    sna/gen7: Tidy detection of unbounded render op
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 1f59eb3..376556a 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2430,10 +2430,11 @@ gen7_composite_set_target(struct sna *sna,
 
 	op->dst.pixmap = get_drawable_pixmap(dst->pDrawable);
 	op->dst.format = dst->format;
-	op->dst.width = op->dst.pixmap->drawable.width;
+	op->dst.width  = op->dst.pixmap->drawable.width;
 	op->dst.height = op->dst.pixmap->drawable.height;
 
-	if (w && h) {
+	if (w | h) {
+		assert(w && h);
 		box.x1 = x;
 		box.y1 = y;
 		box.x2 = x + w;
@@ -2441,9 +2442,9 @@ gen7_composite_set_target(struct sna *sna,
 	} else
 		sna_render_picture_extents(dst, &box);
 
-	op->dst.bo = sna_drawable_use_bo (dst->pDrawable,
-					  PREFER_GPU | FORCE_GPU | RENDER_GPU,
-					  &box, &op->damage);
+	op->dst.bo = sna_drawable_use_bo(dst->pDrawable,
+					 PREFER_GPU | FORCE_GPU | RENDER_GPU,
+					 &box, &op->damage);
 	if (op->dst.bo == NULL)
 		return false;