New upstream snapshot

4 files changed, 112 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 8627af0..86163e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+commit faea008806802ec0e045754ec1eca492ebae320e
+Author: Alex Deucher <alex@botch2.com>
+Date:   Tue May 27 18:36:01 2008 -0400
+
+    R3/4/5xx: use get_param to get the num_gb_pipes from the drm
+
+commit 965a5dbcd9dc4bf1cdd7f2bbdec15e9733b2e090
+Author: Alex Deucher <alex@botch2.com>
+Date:   Tue May 27 16:48:41 2008 -0400
+
+    RADEON: improve support for secondary cards
+    
+    this should fix bugs 16115, 16035
+
+commit 5f951a5573f0c7572230c9aa4d3f75d67f91ed71
+Author: Alex Deucher <alex@botch2.com>
+Date:   Wed May 21 00:35:14 2008 -0400
+
+    ATOM: remove duplicate code
+
+commit edce33e87fb79a540d8c285f205d4c3f2c2bc9f4
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed May 28 06:43:40 2008 +1000
+
+    radeon: fix surface access on avivo chips.
+    
+    This should fix VT switch on vesafb
+
+commit 307bd65a25ee425d8359dd30572b002ce2338f91
+Author: Michael Babej <mbabej@redhat.com>
+Date:   Tue May 27 19:13:49 2008 +1000
+
+    r600: fix vt switch issue
+    
+    RH BZ 441492
+
+commit bf48c9eb8ec592515be9d1732d60283af715674d
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Sat May 24 11:51:20 2008 +1000
+
+    atombios: for LVDS set use ref div as per legacy
+
 commit 04500c8419b1aeaeac7968492b82e1d7cad1d05b
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue May 20 20:34:31 2008 -0700
diff --git a/config.h.in b/config.h.in
index e04b01a..0fd4d47 100644
--- a/config.h.in
+++ b/config.h.in
@@ -20,6 +20,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Have pci_device_enable prototype */
+#undef HAVE_PCI_DEVICE_ENABLE
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
diff --git a/configure b/configure
index 2947b1a..b4ba6a5 100755
--- a/configure
+++ b/configure
@@ -22225,6 +22225,67 @@ _ACEOF
 fi
 
 
+{ echo "$as_me:$LINENO: checking whether pci_device_enable is declared" >&5
+echo $ECHO_N "checking whether pci_device_enable is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_pci_device_enable+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <pciaccess.h>
+
+int
+main ()
+{
+#ifndef pci_device_enable
+  (void) pci_device_enable;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_pci_device_enable=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_pci_device_enable=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_pci_device_enable" >&5
+echo "${ECHO_T}$ac_cv_have_decl_pci_device_enable" >&6; }
+if test $ac_cv_have_decl_pci_device_enable = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PCI_DEVICE_ENABLE 1
+_ACEOF
+
+fi
+
 
 { echo "$as_me:$LINENO: checking whether XSERVER_LIBPCIACCESS is declared" >&5
 echo $ECHO_N "checking whether XSERVER_LIBPCIACCESS is declared... $ECHO_C" >&6; }
diff --git a/debian/changelog b/debian/changelog
index 6cbb54d..2fdf6a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.8.1~git20080528.faea0088-1) experimental; urgency=low
+
+  * New upstream snapshot, up to commit faea0088.
+
+ -- Brice Goglin <bgoglin@debian.org>  Wed, 28 May 2008 11:54:21 +0200
+
 xserver-xorg-video-ati (1:6.8.1~git20080521.04500c84-1) experimental; urgency=low
 
   * New upstream snapshot, up to commit 04500c84.