xserver: Branch 'master'

[Maarten Maathuis]

 exa/exa.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3534a5e5d9c5af85149c799f324257f89507fa23
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Fri Dec 26 16:38:27 2008 +0100

    exa: Allow drivers to set non-NULL devPrivate.ptr for !offscreen pixmaps.

diff --git a/exa/exa.c b/exa/exa.c
index d7949fd..ba063bb 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -313,6 +313,11 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
 
         datasize = h * paddedWidth;
 
+	/* Set this before driver hooks, to allow for !offscreen pixmaps.
+	 * !offscreen pixmaps have a valid pointer at all times.
+	 */
+	pPixmap->devPrivate.ptr = NULL;
+
         pExaPixmap->driverPriv = pExaScr->info->CreatePixmap(pScreen, datasize, 0);
         if (!pExaPixmap->driverPriv) {
              fbDestroyPixmap(pPixmap);
@@ -325,7 +330,6 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
         pExaPixmap->fb_ptr = NULL;
         pExaPixmap->pDamage = NULL;
         pExaPixmap->sys_ptr = pPixmap->devPrivate.ptr;
-        pPixmap->devPrivate.ptr = NULL;
 
     } else {
         pExaPixmap->driverPriv = NULL;