xf86-video-ati: Branch 'master' - 3 commits

[Alex Deucher]

 configure.ac        |    2 +-
 src/atiprint.c      |    1 +
 src/atiprobe.c      |    1 +
 src/radeon_driver.c |    4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

New commits:
diff-tree c9264aa53bf1470ad9104d1e7c4a8ce13c49c270 (from 80eee856938756e1222526b6c39cee8b5252b409)
Author: Joerg Sonnenberger <joerg at britannica.bec.de>
Date:   Tue Oct 9 23:18:29 2007 -0400

    Portability fix from netbsd

diff --git a/configure.ac b/configure.ac
index 5f18d2b..5216eff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,7 @@ sdkdir=$(pkg-config --variable=sdkdir xo
 # Checks for header files.
 AC_HEADER_STDC
 
-if test "$DRI" != no; then
+if test "x$DRI" = xauto; then
 	AC_CHECK_FILE([${sdkdir}/dri.h],
                       [have_dri_h="yes"], [have_dri_h="no"])
 	AC_CHECK_FILE([${sdkdir}/sarea.h],
diff-tree 80eee856938756e1222526b6c39cee8b5252b409 (from 547fef4c6382f8a4951c086ee531b804cba31075)
Author: Matthieu Herb <>
Date:   Tue Oct 9 16:17:50 2007 -0400

    RADEON: fix console restore on netbsd
    
      Include the mode restore bugfix from monolithic Xorg, that is derived
      from the version in xsrc which in turn was provided by Matthieu Herb
      over 3 years ago on the XFree86 lists. Suggested by various
      developers, hold-back due to the working state in xorg-server 1.1.1.
      Tracing down the exact change showed that the changed default color
      depth made this issue a lot more prominent again. Discussed with Eric
      Anholt.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index ffd48a5..7149b12 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5326,7 +5326,7 @@ static void RADEONSave(ScrnInfoPtr pScrn
 	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */
 # else
 	/* Save mode * & fonts & cmap */
-	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS);
+	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL);
 # endif
 	vgaHWLock(hwp);
     }
@@ -5418,7 +5418,7 @@ void RADEONRestore(ScrnInfoPtr pScrn)
 	*/
        vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
 # else
-       vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
+       vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_ALL );
 # endif
        vgaHWLock(hwp);
     }
diff-tree 547fef4c6382f8a4951c086ee531b804cba31075 (from ddec5783103045084a66a34d71326cc6e4a3f598)
Author: Lars Weiler <pylon at gentoo.org>
Date:   Tue Oct 9 16:10:34 2007 -0400

    include stdint.h to fix the build on some platforms
    
    fixes bug 12733

diff --git a/src/atiprint.c b/src/atiprint.c
index 60d9c21..3a1debb 100644
--- a/src/atiprint.c
+++ b/src/atiprint.c
@@ -26,6 +26,7 @@
 
 #include <string.h>
 #include <ctype.h>
+#include <stdint.h>
 
 #include "ati.h"
 #include "atichip.h"
diff --git a/src/atiprobe.c b/src/atiprobe.c
index 78b3edd..38ce90d 100644
--- a/src/atiprobe.c
+++ b/src/atiprobe.c
@@ -26,6 +26,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <stdint.h>
 
 #include "ati.h"
 #include "atibus.h"