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

[Chris Wilson]

 src/sna/sna_accel.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 14a065a267523f9a31be07daaab19b67e9f02290
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Oct 27 18:07:53 2011 +0100

    sna: Create scratch pixmap on the CPU
    
    Contrary to earlier belief, the only usage of
    CREATE_PIXMAP_USAGE_SCRATCH in the dix/mi are either along paths unused
    by us or more importantly for operations which are detrimental to create
    GPU-only buffers. So create CPU pixmaps instead.
    
    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 c0f9572..f3a9251 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -265,11 +265,8 @@ static PixmapPtr sna_create_pixmap(ScreenPtr screen,
 	DBG(("%s(%d, %d, %d, usage=%x)\n", __FUNCTION__,
 	     width, height, depth, usage));
 
-	if (usage == CREATE_PIXMAP_USAGE_SCRATCH &&
-	    to_sna_from_screen(screen)->have_render)
-		return sna_pixmap_create_scratch(screen,
-						 width, height, depth,
-						 I915_TILING_Y);
+	if (usage == CREATE_PIXMAP_USAGE_SCRATCH)
+		return fbCreatePixmap(screen, width, height, depth, usage);
 
 	if (FORCE_GPU_ONLY && width && height)
 		return sna_pixmap_create_scratch(screen,