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 a5561f13498066922b54af04cc71549322ce0e3b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Feb 1 18:05:35 2013 +0000

    sna: Do not add the INPLACE hint if we have the ASYNC hint set
    
    If the caller is preparing to use the GPU to rendering into the CPU bo,
    it will request an ASYNC migration. In those cases, we do not want to
    substitute it with an INPLACE operation.
    
    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 bb2ecb5..87e0c0c 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1908,7 +1908,7 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
 	}
 
 	if (USE_INPLACE &&
-	    (flags & MOVE_READ) == 0 &&
+	    (flags & (MOVE_READ | MOVE_ASYNC_HINT)) == 0 &&
 	    (priv->flush || box_inplace(pixmap, &region->extents))) {
 		DBG(("%s: marking for inplace hint (%d, %d)\n",
 		     __FUNCTION__, priv->flush, box_inplace(pixmap, &region->extents)));