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

[Chris Wilson]

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

New commits:
commit bf4be323e377ab3a2741bf97d8f42fbbc4ccd449
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 12 13:47:18 2013 +0100

    sna: Fix declaration of write intent for can_map__cpu in PutImage
    
    We always are going to write to the image, despite the flag set in
    
    commit fa961ec99a67266687a1934eea24138cf2f7ad19
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Sun Jul 21 18:00:22 2013 +0100
    
        sna: Allow linear inplace uploads along the tiled X PutImage blt paths
    
    which was accidentally conditional on the image not being too large.
    
    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 82b88a4..713f98d 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -4157,8 +4157,7 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
 		break;
 	}
 
-	if (!kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo,
-				  (priv->create & KGEM_CAN_CREATE_LARGE) == 0)) {
+	if (!kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, true)) {
 		DBG(("%s: no, cannot map through the CPU\n", __FUNCTION__));
 		return false;
 	}