[Xquartz-changes] xserver: Branch 'master' - 3 commits

[Jeremy Huddleston]

Rebased ref, commits from common ancestor:
commit f7b375bd141d0cf1e3add5443a5838dd8f554ef6
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Nov 5 11:42:34 2009 -0800

    Enable XF86PM on all Solaris platforms, not just x86/x64
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 8e1edba..de58f21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1575,6 +1575,7 @@ if test "x$XORG" = xyes; then
 	  solaris*)
 	  	XORG_OS="solaris"
 		XORG_OS_SUBDIR="solaris"
+		XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
 		# Use the same stubs as BSD for old functions, since we now
 		# use libpciaccess for PCI
 		xorg_bus_bsdpci="yes"
@@ -1607,7 +1608,6 @@ if test "x$XORG" = xyes; then
 			else
 				SOLARIS_INOUT_ARCH="ia32"
 			fi
-			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
 			;;
 		  *)
 			AC_MSG_ERROR([Unsupported Solaris platform. Only SPARC & x86 \
commit f77262513ea17401092479e17ad20fc0eb91ffb5
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Nov 5 11:42:33 2009 -0800

    Use $(MAKE) instead of "make" to build Solaris inline assembly
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 159b935..914e11f 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -92,7 +92,8 @@ if SOLARIS_ASM_INLINE
 BUILT_SOURCES += os-support/solaris/solaris- at SOLARIS_INOUT_ARCH@.il
 
 os-support/solaris/solaris- at SOLARIS_INOUT_ARCH@.il:
-	cd os-support/solaris ; make solaris- at SOLARIS_INOUT_ARCH@.il
+	cd os-support/solaris ; \
+	 $(MAKE) $(AM_MAKEFLAGS) solaris- at SOLARIS_INOUT_ARCH@.il
 endif
 
 # do not use $(mkdir_p) if you want automake 1.7 to work
commit 964040764387d89ef64324cfbee31872ee6ce41c
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Wed Nov 4 15:35:37 2009 +0200

    EXA: Preserve pPixmap->devPrivate.ptr in exaPixmapIsOffscreen_driver
    
    It crash the server when the drawable is 32 bit and the framebuffer is 16.
    
    This is pretty much a copy-past from commit 8e873185.
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/exa/exa_driver.c b/exa/exa_driver.c
index 9703695..a9165a1 100644
--- a/exa/exa_driver.c
+++ b/exa/exa_driver.c
@@ -204,11 +204,13 @@ exaPixmapIsOffscreen_driver(PixmapPtr pPixmap)
 {
     ScreenPtr pScreen = pPixmap->drawable.pScreen;
     ExaScreenPriv(pScreen);
+    pointer saved_ptr;
     Bool ret;
 
+    saved_ptr = pPixmap->devPrivate.ptr;
     pPixmap->devPrivate.ptr = ExaGetPixmapAddress(pPixmap);
     ret = pExaScr->info->PixmapIsOffscreen(pPixmap);
-    pPixmap->devPrivate.ptr = NULL;
+    pPixmap->devPrivate.ptr = saved_ptr;
 
     return ret;
 }