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

[Dave Airlie]

 configure.ac       |   25 ++++++++++++++-----------
 src/atiprobe.c     |    7 +++++--
 src/radeon_video.c |    7 -------
 3 files changed, 19 insertions(+), 20 deletions(-)

New commits:
diff-tree f25ba3dc0e7850f0b1b78f54c0e7211bf2e81b3a (from 764013ec61b9043f1487513658e374569f7154a9)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Fri Jun 16 11:38:18 2006 +0200

    Remove obsolete FIXME.

diff --git a/src/radeon_video.c b/src/radeon_video.c
index c59298a..07270a1 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -30,13 +30,6 @@
 #include "msp3430.h"
 #include "tda9885.h"
 
-#ifdef USE_EXA
-/* FIXME : the video code hasn't been ported so this is a hack to make
- * it compile at all without too much ifdefing */
-#include "xaa.h"
-#include "xf86fbman.h"
-#endif
-
 #define OFF_DELAY       250  /* milliseconds */
 #define FREE_DELAY      15000
 
diff-tree 764013ec61b9043f1487513658e374569f7154a9 (from 3c701d49b3eb7adb82267cec53163e475913aca3)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Fri Jun 16 10:56:02 2006 +0200

    Use AC_CHECK_HEADER() to check for exa.h

diff --git a/configure.ac b/configure.ac
index c4df2c1..ddb9dca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,8 +186,12 @@ AC_DEFINE(USE_XAA, 1, [Build support for
 AC_MSG_CHECKING([whether to enable EXA support])
 if test "x$EXA" = xyes; then
         AC_MSG_RESULT(yes)
-        AC_CHECK_FILE([${sdkdir}/exa.h],
-                      [have_exa_h="yes"], [have_exa_h="no"])
+
+        SAVE_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+        AC_CHECK_HEADER(exa.h,
+                       [have_exa_h="yes"], [have_exa_h="no"])
+        CPPFLAGS="$SAVE_CPPFLAGS"
 else
         AC_MSG_RESULT(no)
 fi 
diff-tree 3c701d49b3eb7adb82267cec53163e475913aca3 (from dbef62615f38aebf4cdc579e3b26a7e7c719abc4)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Fri Jun 16 09:59:29 2006 +0200

    Use AC_MSG_RESULT() instead of echo for check results.

diff --git a/configure.ac b/configure.ac
index ca4faf1..c4df2c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,19 +151,19 @@ esac
 AC_MSG_CHECKING([whether to include PIO support])
 AM_CONDITIONAL(ATIMISC_CPIO, test "x$ATIMISC_CPIO" = xyes)
 if test "x$ATIMISC_CPIO" = xyes; then
-	echo "yes, PIO"
+	AC_MSG_RESULT([yes, PIO])
 else
 	AC_DEFINE(AVOID_CPIO, 1, [Avoid PIO and use MMIO for atimisc.])
-	echo "no, MMIO"
+	AC_MSG_RESULT([no, MMIO])
 fi
 
 AC_MSG_CHECKING([whether to include support for non-PCI devices])
 AM_CONDITIONAL(ATIMISC_NON_PCI, test "x$ATIMISC_NON_PCI" = xyes)
 if test "x$ATI_AVOID_NON_PCI" = xyes; then
-	echo "yes, PCI and ISA"
+	AC_MSG_RESULT([yes, PCI and ISA])
 else
 	AC_DEFINE(AVOID_NON_PCI, 1, [Only probe PCI cards; do not probe ISA.])
-	echo "no, PCI only"
+	AC_MSG_RESULT([no, PCI only])
 fi
 
 AC_MSG_CHECKING([whether to include DGA support])
@@ -185,11 +185,11 @@ AC_DEFINE(USE_XAA, 1, [Build support for
 # Properly handle EXA.
 AC_MSG_CHECKING([whether to enable EXA support])
 if test "x$EXA" = xyes; then
-        echo "yes"
+        AC_MSG_RESULT(yes)
         AC_CHECK_FILE([${sdkdir}/exa.h],
                       [have_exa_h="yes"], [have_exa_h="no"])
 else
-        echo "no"
+        AC_MSG_RESULT(no)
 fi 
 
 SAVE_CPPFLAGS="$CPPFLAGS"
@@ -204,11 +204,10 @@ if test "x$have_exa_h" = xyes; then
                           ]])],
                           [USE_EXA=yes],
                           [USE_EXA=no])
+        AC_MSG_RESULT($USE_EXA)
+
         if test "x$USE_EXA" = xyes; then
-                echo "yes."
                 AC_DEFINE(USE_EXA, 1, [Build support for Exa])
-        else
-                echo "no."
         fi
 fi
 CPPFLAGS="$SAVE_CPPFLAGS"
diff-tree dbef62615f38aebf4cdc579e3b26a7e7c719abc4 (from a01c01787cfbe3706ae7747cde1657abd79ecdaa)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Fri Jun 16 08:50:49 2006 +0200

    conditionally declare pPCI and PciReg, too

diff --git a/src/atiprobe.c b/src/atiprobe.c
index df74a42..da214d4 100644
--- a/src/atiprobe.c
+++ b/src/atiprobe.c
@@ -997,10 +997,8 @@ ATIProbe
     ATIPtr                 pATI, *ATIPtrs = NULL;
     GDevPtr                *GDevs, pGDev;
     pciVideoPtr            pVideo, *xf86PciVideoInfo = xf86GetPciVideoInfo();
-    pciConfigPtr           pPCI;
     ATIGDev                *ATIGDevs = NULL, *pATIGDev;
     ScrnInfoPtr            pScreenInfo;
-    CARD32                 PciReg;
     Bool                   ProbeSuccess = FALSE;
     Bool                   DoRage128 = FALSE, DoRadeon = FALSE;
     int                    i, j, k;
@@ -1008,6 +1006,11 @@ ATIProbe
     int                    Chipset;
     ATIChipType            Chip;
 
+#if !defined(AVOID_NON_PCI) || !defined(AVOID_CPIO)
+    pciConfigPtr           pPCI;
+    CARD32                 PciReg;
+#endif /* AVOID_NON_PCI || AVOID_CPIO */
+
 #ifndef AVOID_NON_PCI
     ATIPtr                 pMach64[3] = {NULL, NULL, NULL};
 #endif