xf86-video-intel: src/sna/sna_accel.c

[Chris Wilson]

 src/sna/sna_accel.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4274110b78f8962b921f773e67c981b033c3f664
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Dec 3 11:03:39 2013 +0000

    sna: Clear the clear hint after performing a userptr upload
    
    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 9260ac8..0c3d1c6 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -4266,9 +4266,7 @@ try_upload_blt(PixmapPtr pixmap, RegionRec *region,
 
 	if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
 		assert(!priv->clear);
-		if (region->data == NULL &&
-		    w >= pixmap->drawable.width &&
-		    h >= pixmap->drawable.height) {
+		if (region_subsumes_drawable(region, &pixmap->drawable)) {
 			sna_damage_all(&priv->gpu_damage,
 				       pixmap->drawable.width,
 				       pixmap->drawable.height);
@@ -4287,6 +4285,8 @@ try_upload_blt(PixmapPtr pixmap, RegionRec *region,
 			sna_pixmap_free_cpu(sna, priv, priv->cpu);
 		}
 	}
+	priv->clear = false;
+	priv->cpu = false;
 
 	return true;
 }