From bf4be323e377ab3a2741bf97d8f42fbbc4ccd449 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 12 Sep 2013 13:47:18 +0100 Subject: [PATCH] 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 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 --- src/sna/sna_accel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 82b88a4e..713f98da 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; }