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

[Chris Wilson]

 src/sna/sna_accel.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit b0c3170c1092d01b4937f352a3962854785ee549
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jan 27 19:09:38 2013 +0000

    sna: Add the pixmap to the flushing list when creating for inplace CPU writes
    
    Reported-by: Jiri Slaby <jirislaby at gmail.com>
    References: https://bugs.freedesktop.org/show_bug.cgi?id=47597
    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 e388d80..2bb6d90 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1553,16 +1553,12 @@ skip_inplace_map:
 			assert(priv->gpu_bo == NULL || priv->gpu_damage == NULL);
 
 			sna_damage_destroy(&priv->cpu_damage);
-
-			sna_pixmap_free_gpu(sna, priv);
 			sna_pixmap_free_cpu(sna, priv);
 
 			if (!sna_pixmap_alloc_cpu(sna, pixmap, priv, false))
 				return false;
 
-			sna_damage_all(&priv->cpu_damage,
-					pixmap->drawable.width,
-					pixmap->drawable.height);
+			goto mark_damage;
 		}
 	}
 
@@ -1717,6 +1713,7 @@ skip_inplace_map:
 	}
 
 	if (flags & MOVE_WRITE || priv->create & KGEM_CAN_CREATE_LARGE) {
+mark_damage:
 		DBG(("%s: marking as damaged\n", __FUNCTION__));
 		sna_damage_all(&priv->cpu_damage,
 			       pixmap->drawable.width,