From 6b96281100f2118fe9d99536c33d48298a5bce7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
Date: Fri, 6 Jun 2008 11:01:03 +0200
Subject: [PATCH] EXA: Fix exaGetPixmapFirstPixel() crash if the driver has a
 CreatePixmap hook.

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16243
---
 exa/exa_unaccel.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 5a2576414..ee6b98e35 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -362,6 +362,7 @@ ExaCheckComposite (CARD8      op,
 CARD32
 exaGetPixmapFirstPixel (PixmapPtr pPixmap)
 {
+    ExaScreenPriv(pPixmap->drawable.pScreen);
     CARD32 pixel;
     void *fb;
     Bool need_finish = FALSE;
@@ -376,7 +377,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap)
     fb = pExaPixmap->sys_ptr;
 
     /* Try to avoid framebuffer readbacks */
-    if ((!offscreen && !sys_valid && !damaged) ||
+    if (pExaScr->info->CreatePixmap ||
+	(!offscreen && !sys_valid && !damaged) ||
 	(offscreen && (!sys_valid || damaged)))
     {
 	box.x1 = 0;