xserver: Branch 'master'

[Maarten Maathuis]

 exa/exa.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 89d7b88f32f9227fa72a043675367b94c4c9283c
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Fri Mar 13 00:40:43 2009 +0100

    exa: allow exaModifyPixmapHeader to set sys_ptr for EXA_HANDLES_PIXMAPS
    
    - exaModifyPixmapHeader would save sys_ptr if needed, but it would be NULL'ed afterwards.
    - This is needed to support pixmaps that are not offscreen.

diff --git a/exa/exa.c b/exa/exa.c
index b5f3542..7145e12 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -332,12 +332,14 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
 	    return NULL;
         }
 
-        (*pScreen->ModifyPixmapHeader)(pPixmap, w, h, 0, 0,
-                                       paddedWidth, NULL);
-        pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
-        pExaPixmap->fb_ptr = NULL;
-        pExaPixmap->pDamage = NULL;
-        pExaPixmap->sys_ptr = pPixmap->devPrivate.ptr;
+	/* Allow ModifyPixmapHeader to set sys_ptr appropriately. */
+	pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
+	pExaPixmap->fb_ptr = NULL;
+	pExaPixmap->pDamage = NULL;
+	pExaPixmap->sys_ptr = NULL;
+
+	(*pScreen->ModifyPixmapHeader)(pPixmap, w, h, 0, 0,
+					paddedWidth, NULL);
 
     } else {
         pExaPixmap->driverPriv = NULL;