From 1cc07fa2d24b10ac95c7a84908290ec06539d447 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 23 Dec 2011 20:31:21 +0000
Subject: [PATCH] sna: Avoid forced creation of GPU bo for tiny operations and
 dirty pixmaps

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_accel.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index a95490df..9cde9492 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1090,7 +1090,8 @@ _sna_drawable_use_gpu_bo(DrawablePtr drawable,
 	if (priv == NULL)
 		return FALSE;
 
-	if (pixmap->devPrivate.ptr == NULL &&
+	if (priv->cpu_damage == NULL &&
+	    sna_pixmap_choose_tiling(pixmap) != I915_TILING_NONE &&
 	    !sna_pixmap_move_to_gpu(pixmap, MOVE_READ | MOVE_WRITE))
 		return FALSE;