xserver: Branch 'server-1.7-nominations' - 5 commits

[Peter Hutterer]

 configure.ac           |    6 +++---
 dix/cursor.c           |    3 ++-
 exa/exa_driver.c       |    4 +++-
 hw/xfree86/Makefile.am |    3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 2d55b842b8cda6a0292269304c9d86ff90dec40f
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Nov 6 14:38:22 2009 +1000

    xserver 1.7.1.901
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 9a86f5f..29e7da8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.7.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2009-10-23"
+AC_INIT([xorg-server], 1.7.1.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2009-11-6"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit 4fe904f2d50d4a7cc68ab6056483b6d8b4178539
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>
    (cherry picked from commit f7b375bd141d0cf1e3add5443a5838dd8f554ef6)

diff --git a/configure.ac b/configure.ac
index e913c66..9a86f5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1529,6 +1529,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"
@@ -1561,7 +1562,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 f0dc842b1487edeb6c058cdb92995e2a4673028c
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>
    (cherry picked from commit f77262513ea17401092479e17ad20fc0eb91ffb5)

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 05d6672a1b551916e832d24920a97b6eed8fa026
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>
    (cherry picked from commit 964040764387d89ef64324cfbee31872ee6ce41c)

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;
 }
commit 269202982d4a3ab8bb31caa0fd72088d61eba66c
Author: Rami Ylimaki <ext-rami.ylimaki at nokia.com>
Date:   Wed Nov 4 15:59:30 2009 +0200

    dix: Fixes a memory leak when a cursor resource is released.
    
    Just open and close a client that creates cursors in order to
    reproduce. In the problem case bits->refcnt is -1 and therefore
    bits->devPrivates is never released.
    
    Signed-off-by: Rami Ylimaki <ext-rami.ylimaki at nokia.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 0573042cddb6f9942e408687a16c6842e62a8bfa)

diff --git a/dix/cursor.c b/dix/cursor.c
index 086d008..6103b15 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -86,6 +86,8 @@ FreeCursorBits(CursorBitsPtr bits)
 #ifdef ARGB_CURSOR
     xfree(bits->argb);
 #endif
+    dixFreePrivates(bits->devPrivates);
+    bits->devPrivates = NULL;
     if (bits->refcnt == 0)
     {
 	GlyphSharePtr *prev, this;
@@ -100,7 +102,6 @@ FreeCursorBits(CursorBitsPtr bits)
 	    CloseFont(this->font, (Font)0);
 	    xfree(this);
 	}
-	dixFreePrivates(bits->devPrivates);
 	xfree(bits);
     }
 }