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

[Chris Wilson]

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

New commits:
commit 44dad490140d85a4c0dcb916030c36a838670c01
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 21 16:22:35 2012 +0000

    sna: Do not dispose of a shadow pixmap
    
    Fixes regression from 2249e9edc37811c07e2807d6b4def05585b44c22
    
    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 4b0d014..b38f80f 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3156,7 +3156,8 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
 	}
 
 	/* For large bo, try to keep only a single copy around */
-	if (priv->create & KGEM_CAN_CREATE_LARGE || flags & MOVE_SOURCE_HINT) {
+	if (priv->create & KGEM_CAN_CREATE_LARGE ||
+	    (priv->stride && flags & MOVE_SOURCE_HINT)) {
 		DBG(("%s: disposing of system copy for large/source\n",
 		     __FUNCTION__));
 		assert(!priv->shm);