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

[Chris Wilson]

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

New commits:
commit 8d1d3c6e6102ff20fbff74ec6b3b2e94ee757015
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Feb 7 14:47:07 2013 +0000

    sna: Fixup an invalid assertion
    
    We may choose to operate inplace on a buffer last used by the CPU if we
    are discarding all the existing damage.
    
    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 87e0c0c..7c8a360 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1581,7 +1581,7 @@ skip_inplace_map:
 		kgem_bo_submit(&sna->kgem, priv->gpu_bo);
 
 		DBG(("%s: try to operate inplace (GTT)\n", __FUNCTION__));
-		assert(priv->cpu == false);
+		assert((flags & MOVE_READ) == 0 || priv->cpu == false);
 
 		pixmap->devPrivate.ptr = kgem_bo_map(&sna->kgem, priv->gpu_bo);
 		priv->mapped = pixmap->devPrivate.ptr != NULL;