New upstream release snapshot

6 files changed, 228 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 27b81ae..3a7699d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,154 @@
+commit 94bf8f01bd43cb103fffecfe04d04a214f892baf
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon May 12 20:02:51 2008 +1000
+
+    radeon: fix set_cursor_colours remove fb offset
+
+commit 1d0f1d31e2ed1d91ee87cb3e02ce48c8c07aa418
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon May 12 15:44:35 2008 +1000
+
+    radeon: rs485 vs rs485m.. mobile? non-mobile? bi?
+    
+    So it appears we have in the wild two chipsets with the same PCI ID (0x1002:0x5974)
+    that are mobile and non-mobile.
+    
+    the RH bug references is a desktop system.
+    The Dell Vostro 1100 also has this chipset with LVDS bits.
+
+commit 25e0c3945a51ae8c14b3a847ec75a256e1397f24
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Mon May 12 10:28:33 2008 +1000
+
+    radeon: add initial support for cloning outputs. (single-CRTC cards only)
+    
+    airlied - This code was originally written by Alex, and I've modified it to
+    only run on single-CRTC cards for now until we can test it some more.
+
+commit 94405eb1c9e4e0ababc6aef03b753d6ed9eb7838
+Author: Alex Deucher <alex@t41p.hsd1.va.comcast.net>
+Date:   Fri May 9 05:28:44 2008 -0400
+
+    RADEON: fixup ifdef from last commit
+
+commit 18e20bc22a55ecfee9798c01079d7b24d19f0051
+Author: Alex Deucher <alex@t41p.hsd1.va.comcast.net>
+Date:   Thu May 8 08:45:51 2008 -0400
+
+    RADEON: disable MMIO paths for EXA composite/texvid on IGP/R5xx
+    
+    The MMIO paths eventually lead to a hang on r5xx/IGP.  I haven't
+    been able to find out why yet.
+
+commit c3532268875fd24e6519bea2fb1b814d612bbdb4
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Wed May 7 02:37:18 2008 +1000
+
+    radeon: fix zaphod EXA with texture video
+
+commit ffc437f3606ab8ceba1ff152e4bb08988a58b54c
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Wed May 7 02:30:28 2008 +1000
+
+    avivo: fix zaphod cursor in theory
+
+commit e36ef14e3a1087e1fe41baa26ade2937f396001f
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Wed May 7 01:39:28 2008 +1000
+
+    radeon: fix textured-xv on zaphod
+
+commit 8fc19bee27c0f151d2ab3354f6ac0992b358436d
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Wed May 7 01:38:24 2008 +1000
+
+    radeon: zaphod: fix render accel for EXA
+
+commit fc41b9042a5220a8419cc7b69ca3850cae6b903c
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Wed May 7 01:32:23 2008 +1000
+
+    radeon: fix EXA pixmap offset on zaphod
+
+commit 4568cb820d567c6909a4be956d7e79b91232535e
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Wed May 7 01:19:39 2008 +1000
+
+    radeon: zaphod fixes for pciaccess not allowing multiple MMIO maps
+
+commit ca81fa086b21633a7fd926833fb6d1d4fa080646
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Wed May 7 01:12:01 2008 +1000
+
+    radeon: zaphod fix for cursor on second head
+    
+    We don't need to add fbOffset here as the mmap we have of the framebuffer
+    starts half way.
+
+commit 24b60c8965f6a0b3f0c2bb1e7236b4d6642c5918
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri May 2 15:30:45 2008 -0400
+
+    Add a test for __GLIBC__ to CD_Common_Types.h.
+    
+    Atombios redefines the standard types but the definitions conflict
+    with the ones from glibc (causes build failures on GNU/Hurd
+    and GNU/kFreeBSD).
+
+commit f051359ac09c6b9416e39b9ca7d9dc0880aa1557
+Author: thegraze <thegraze@googlemail.com>
+Date:   Fri May 2 14:02:16 2008 -0400
+
+    ATOM: add support for DragonFlyBSD
+
+commit 3d469cbc3225d890a895dac7cbc1ab7e08054b48
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Wed Apr 30 18:33:04 2008 -0400
+
+    RADEON: lock the cursors when updating
+    
+    this should fix occasional corruption seen when updating
+    the cursor.
+
+commit 445b71021843665ba32f37b2ce5c9d2857c07cc7
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Tue Apr 29 21:01:41 2008 -0400
+
+    RADEON: assorted fixes
+    
+    - free rotate pixmaps on VT switch
+    - save crtc/output status so we only turn on
+    crtcs/outputs if they are off
+    - show/hide cursors when changing modes
+
+commit 070cce5255a5c311f9d8b85ec54bd56655014933
+Author: Stephan Wolf <stephan@letzte-bankreihe.de>
+Date:   Mon Apr 28 11:26:37 2008 -0400
+
+    R3xx+: further fix for IGP chips
+    
+    see bug 15538
+
+commit 211e0041c7fc2df494b77428553943a2b526ee4e
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Sun Apr 27 21:08:00 2008 -0400
+
+    IGP: fix EXA composite corruption
+
+commit 656b06bdde129ca4fc370f5a2cf7311c9179b0ff
+Author: Alex Deucher <alex@botch2.com>
+Date:   Sun Apr 27 20:20:49 2008 -0400
+
+    RADEON: remove duplicate register define
+    
+    Also add more bit defs to wait_until register
+
+commit 8a9820a3aa49bc667f90ac291a27e4d7b4ae38b3
+Author: Alex Deucher <alex@botch2.com>
+Date:   Sun Apr 27 19:02:22 2008 -0400
+
+    RADEON: decrease crtc/output verbosity
+
 commit c5d62fa0e8f52c3264ff9db3ff10cdf5a806bfc0
 Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
 Date:   Thu Apr 17 13:14:53 2008 +0200
diff --git a/aclocal.m4 b/aclocal.m4
index ebc910c..62b902b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/config.h.in b/config.h.in
index 91eecd1..e04b01a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -11,6 +11,9 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
+/* have new FreeShadow API */
+#undef HAVE_FREE_SHADOW
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
diff --git a/configure b/configure
index 6262e98..2947b1a 100755
--- a/configure
+++ b/configure
@@ -22161,6 +22161,71 @@ _ACEOF
 fi
 
 
+{ echo "$as_me:$LINENO: checking whether xf86RotateFreeShadow is declared" >&5
+echo $ECHO_N "checking whether xf86RotateFreeShadow is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_xf86RotateFreeShadow+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 <xorg-server.h>
+               #include <windowstr.h>
+	       #include <xf86Crtc.h>
+
+int
+main ()
+{
+#ifndef xf86RotateFreeShadow
+  (void) xf86RotateFreeShadow;
+#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_xf86RotateFreeShadow=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_xf86RotateFreeShadow=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_xf86RotateFreeShadow" >&5
+echo "${ECHO_T}$ac_cv_have_decl_xf86RotateFreeShadow" >&6; }
+if test $ac_cv_have_decl_xf86RotateFreeShadow = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FREE_SHADOW 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; }
 if test "${ac_cv_have_decl_XSERVER_LIBPCIACCESS+set}" = set; then
diff --git a/debian/changelog b/debian/changelog
index 0e951f8..5b41b2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-ati (1:6.8.1~git20080512.94bf8f01-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot, up to commit 94bf8f01.
+    + Fix some DPMS-related brief blanking, closes: #467105.
+
+ -- Brice Goglin <bgoglin@debian.org>  Mon, 12 May 2008 13:37:22 +0200
+
 xserver-xorg-video-ati (1:6.8.1~git20080417.c5d62fa0-1) experimental; urgency=low
 
   * New upstream snapshot, up to commit c5d62fa0.
diff --git a/ltmain.sh b/ltmain.sh
index bba8b1c..0bf3848 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-3"
+VERSION="1.5.26 Debian 1.5.26-4"
 TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).