ChangeLog | 62 +++++
config.h.in | 15 +
configure | 460 ++++++++++++++++++++++++++++++++++++++-
configure.ac | 62 +++++
debian/changelog | 6
src/radeon_accel.c | 6
src/radeon_accelfuncs.c | 40 +++
src/radeon_atombios.c | 7
src/radeon_exa.c | 2
src/radeon_exa_funcs.c | 25 +-
src/radeon_exa_render.c | 23 -
src/radeon_macros.h | 16 +
src/radeon_reg.h | 1
src/radeon_textured_videofuncs.c | 13 +
14 files changed, 706 insertions(+), 32 deletions(-)
New commits:
commit 4f4c45cf5f38f9fd97383c888cfe2f011979c649
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Fri Jun 27 07:22:28 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 0457592..33200fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-ati (1:6.9.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.9.0-1) unstable; urgency=low
* New upstream release.
- -- Brice Goglin <[EMAIL PROTECTED]> Fri, 27 Jun 2008 07:14:47 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Fri, 27 Jun 2008 07:22:21 +0200
xserver-xorg-video-ati (1:6.8.192-1) unstable; urgency=low
commit 49e65dfc9a815e29cf02102faa837d6c30f18ef7
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Fri Jun 27 07:22:12 2008 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 7978cf2..51ab107 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,65 @@
+commit c83fbdfa076c107012b7dfbbfbbb2feede00542b
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Thu Jun 26 19:48:45 2008 -0400
+
+ Bump for 6.9.0 release
+
+commit 32e1d1daf4f68ea37624afaa2bc1ea7742e1163b
+Author: Brad Smith <[EMAIL PROTECTED]>
+Date: Thu Jun 26 10:22:03 2008 -0400
+
+ RADEON: sys/endian.h needs sys/types.h on BSDs
+
+ See bug 16512
+
+commit dca522355a9039eca6efaba3b36397b246800f94
+Author: Brad Smith <[EMAIL PROTECTED]>
+Date: Thu Jun 26 10:13:59 2008 -0400
+
+ RADEON: fix copy/paste error in accel code
+
+commit f4292e110105910d0c19bf2db28e2682b27af2c7
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Fri Jun 20 15:31:43 2008 +1000
+
+ Revert "Revert "ATOM: disable TV-out for now""
+
+ Oops I really didn't mean to do this, I was testing something and it
slipped
+ past.
+
+ This reverts commit dd18caa4b2efc430eaae0c4362b65641f9bef440.
+
+commit bb1cfcbfbc1ace1f257fc3bf6401501f1a6da827
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Wed Jun 25 15:50:16 2008 -0400
+
+ RADEON: adjustments to Jerome's last commit
+
+ - Flush caches and wait for idle after drawing
+ - Make sure 3D is idle too (after composite or textured video)
+
+commit 07be302f6dba61dd15918963fae66502230c74b7
+Merge: 8c9b8de... 5245974...
+Author: Jerome Glisse <[EMAIL PROTECTED]>
+Date: Wed Jun 25 10:30:45 2008 +0200
+
+ Merge branch 'master' of
git://anongit.freedesktop.org/xorg/driver/xf86-video-ati
+
+commit 8c9b8de0373797cba6f0a27e6b6f461e1070fef9
+Author: Jerome Glisse <[EMAIL PROTECTED]>
+Date: Wed Jun 25 10:28:26 2008 +0200
+
+ radeon: flush & wait for 2d & dma idle after 2d blit
+
+ This should help to avoid 2d & 3d engine to step on each
+ other dma transaction.
+
+commit 52459745ec05de88adbc087e9566fe6d97ef424b
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Wed Jun 25 17:09:11 2008 +1000
+
+ ati: hopefully fix byteswap mess for those other OSes.
+
commit 67a6ac0001bc9d062aa426384a11a41fa7a1c09a
Author: Alex Deucher <[EMAIL PROTECTED]>
Date: Tue Jun 24 21:06:37 2008 -0400
diff --git a/config.h.in b/config.h.in
index 0fd4d47..1fcf216 100644
--- a/config.h.in
+++ b/config.h.in
@@ -8,6 +8,9 @@
/* Use linux pragma pack */
#undef FGL_LINUX
+/* Define to 1 if you have the <byteswap.h> header file. */
+#undef HAVE_BYTESWAP_H
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -86,6 +89,9 @@
/* Build support for Exa */
#undef USE_EXA
+/* Define to use byteswap macros from <sys/endian.h> */
+#undef USE_SYS_ENDIAN_H
+
/* Build support for XAA */
#undef USE_XAA
@@ -100,3 +106,12 @@
/* X server has built-in mode code */
#undef XMODES
+
+/* Define to 16-bit byteswap macro */
+#undef bswap_16
+
+/* Define to 32-bit byteswap macro */
+#undef bswap_32
+
+/* Define to 64-bit byteswap macro */
+#undef bswap_64
diff --git a/configure b/configure
index c2f0379..65f0818 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-ati 6.8.192.
+# Generated by GNU Autoconf 2.61 for xf86-video-ati 6.9.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-ati'
PACKAGE_TARNAME='xf86-video-ati'
-PACKAGE_VERSION='6.8.192'
-PACKAGE_STRING='xf86-video-ati 6.8.192'
+PACKAGE_VERSION='6.9.0'
+PACKAGE_STRING='xf86-video-ati 6.9.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1443,7 +1443,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-ati 6.8.192 to adapt to many kinds of
systems.
+\`configure' configures xf86-video-ati 6.9.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1513,7 +1513,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-ati 6.8.192:";;
+ short | recursive ) echo "Configuration of xf86-video-ati 6.9.0:";;
esac
cat <<\_ACEOF
@@ -1635,7 +1635,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-ati configure 6.8.192
+xf86-video-ati configure 6.9.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1649,7 +1649,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-ati $as_me 6.8.192, which was
+It was created by xf86-video-ati $as_me 6.9.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2344,7 +2344,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-ati'
- VERSION='6.8.192'
+ VERSION='6.9.0'
cat >>confdefs.h <<_ACEOF
@@ -22538,6 +22538,446 @@ else
fi
+# Checks for headers/macros for byte swapping
+# Known variants:
+# <byteswap.h> bswap_16, bswap_32, bswap_64 (glibc)
+# <sys/endian.h> __swap16, __swap32, __swap64 (OpenBSD)
+# <sys/endian.h> bswap16, bswap32, bswap64 (other BSD's)
+# and a fallback to local macros if none of the above are found
+
+# if <byteswap.h> is found, assume it's the correct version
+
+for ac_header in byteswap.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_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_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+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_cpp conftest.$ac_ext") 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); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler,
rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the
preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the
compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be
compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing
prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite
headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf
documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be
Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the
preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result"
>&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler
will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take
precedence" >&2;}
+ ( cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+# if <sys/endian.h> is found, have to check which version
+if test "${ac_cv_header_sys_endian_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for sys/endian.h" >&5
+echo $ECHO_N "checking for sys/endian.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sys_endian_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_endian_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_endian_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking sys/endian.h usability" >&5
+echo $ECHO_N "checking sys/endian.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <sys/endian.h>
+_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_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking sys/endian.h presence" >&5
+echo $ECHO_N "checking sys/endian.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/endian.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+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_cpp conftest.$ac_ext") 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); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: sys/endian.h: accepted by the compiler,
rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sys/endian.h: accepted by the compiler, rejected by the
preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/endian.h: proceeding with the
compiler's result" >&5
+echo "$as_me: WARNING: sys/endian.h: proceeding with the compiler's result"
>&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: sys/endian.h: present but cannot be
compiled" >&5
+echo "$as_me: WARNING: sys/endian.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/endian.h: check for missing
prerequisite headers?" >&5
+echo "$as_me: WARNING: sys/endian.h: check for missing prerequisite
headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/endian.h: see the Autoconf
documentation" >&5
+echo "$as_me: WARNING: sys/endian.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/endian.h: section \"Present But
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sys/endian.h: section \"Present But Cannot Be
Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/endian.h: proceeding with the
preprocessor's result" >&5
+echo "$as_me: WARNING: sys/endian.h: proceeding with the preprocessor's
result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/endian.h: in the future, the compiler
will take precedence" >&5
+echo "$as_me: WARNING: sys/endian.h: in the future, the compiler will take
precedence" >&2;}
+ ( cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for sys/endian.h" >&5
+echo $ECHO_N "checking for sys/endian.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sys_endian_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_sys_endian_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_endian_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_endian_h" >&6; }
+
+fi
+if test $ac_cv_header_sys_endian_h = yes; then
+ HAVE_SYS_ENDIAN_H="yes"
+else
+ HAVE_SYS_ENDIAN_H="no"
+fi
+
+
+
+if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then
+ { echo "$as_me:$LINENO: checking for __swap16 variant of <sys/endian.h>
byteswapping macros" >&5
+echo $ECHO_N "checking for __swap16 variant of <sys/endian.h> byteswapping
macros... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <sys/types.h>
+#include <sys/endian.h>
+
+int
+main ()
+{
+
+int a = 1, b;
+b = __swap16(a);
+
+ ;
+ return 0;
+}
+
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+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_link") 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_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ SYS_ENDIAN__SWAP='yes'
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ SYS_ENDIAN__SWAP='no'
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $SYS_ENDIAN__SWAP" >&5
+echo "${ECHO_T}$SYS_ENDIAN__SWAP" >&6; }
+
+ { echo "$as_me:$LINENO: checking for bswap16 variant of <sys/endian.h>
byteswapping macros" >&5
+echo $ECHO_N "checking for bswap16 variant of <sys/endian.h> byteswapping
macros... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <sys/types.h>
+#include <sys/endian.h>
+
+int
+main ()
+{
+
+int a = 1, b;
+b = bswap16(a);
+
+ ;
+ return 0;
+}
+
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+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_link") 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_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ SYS_ENDIAN_BSWAP='yes'
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ SYS_ENDIAN_BSWAP='no'
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $SYS_ENDIAN_BSWAP" >&5
+echo "${ECHO_T}$SYS_ENDIAN_BSWAP" >&6; }
+
+ if test "$SYS_ENDIAN_BSWAP" = "yes" ; then
+ USE_SYS_ENDIAN_H=yes
+ BSWAP=bswap
+ else
+ if test "$SYS_ENDIAN__SWAP" = "yes" ; then
+ USE_SYS_ENDIAN_H=yes
+ BSWAP=__swap
+ else
+ USE_SYS_ENDIAN_H=no
+ fi
+ fi
+
+ if test "$USE_SYS_ENDIAN_H" = "yes" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYS_ENDIAN_H 1
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define bswap_16 ${BSWAP}16
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define bswap_32 ${BSWAP}32
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define bswap_64 ${BSWAP}64
+_ACEOF
+
+ fi
+fi
+
case $host_os in
*linux*)
@@ -23323,7 +23763,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-ati $as_me 6.8.192, which was
+This file was extended by xf86-video-ati $as_me 6.9.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23376,7 +23816,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-ati config.status 6.8.192
+xf86-video-ati config.status 6.9.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 064b452..0457592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.9.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Fri, 27 Jun 2008 07:14:47 +0200
+
xserver-xorg-video-ati (1:6.8.192-1) unstable; urgency=low
* New upstream release.
commit c83fbdfa076c107012b7dfbbfbbb2feede00542b
Author: Alex Deucher <[EMAIL PROTECTED]>
Date: Thu Jun 26 19:48:45 2008 -0400
Bump for 6.9.0 release
diff --git a/configure.ac b/configure.ac
index 4bf7487..b8c18a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ati],
- 6.8.192,
+ 6.9.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ati)
commit 32e1d1daf4f68ea37624afaa2bc1ea7742e1163b
Author: Brad Smith <[EMAIL PROTECTED]>
Date: Thu Jun 26 10:22:03 2008 -0400
RADEON: sys/endian.h needs sys/types.h on BSDs
See bug 16512
diff --git a/configure.ac b/configure.ac
index 9ac46f7..4bf7487 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,6 +260,7 @@ AC_CHECK_HEADER([sys/endian.h], [HAVE_SYS_ENDIAN_H="yes"],
[HAVE_SYS_ENDIAN_H="n
if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then
AC_MSG_CHECKING([for __swap16 variant of <sys/endian.h> byteswapping
macros])
AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include <sys/types.h>
#include <sys/endian.h>
], [
int a = 1, b;
@@ -270,6 +271,7 @@ b = __swap16(a);
AC_MSG_CHECKING([for bswap16 variant of <sys/endian.h> byteswapping
macros])
AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include <sys/types.h>
#include <sys/endian.h>
], [
int a = 1, b;
commit dca522355a9039eca6efaba3b36397b246800f94
Author: Brad Smith <[EMAIL PROTECTED]>
Date: Thu Jun 26 10:13:59 2008 -0400
RADEON: fix copy/paste error in accel code
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index d45e932..65ad33d 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -371,7 +371,7 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
info->CurrentLayout.bitsPerPixel);
#ifdef XF86DRI
- if (info->directRenderingEnabled && (IS_R300_3D | IS_R500_3D)) {
+ if (info->directRenderingEnabled && (IS_R300_3D || IS_R500_3D)) {
drmRadeonGetParam np;
int num_pipes;
@@ -419,11 +419,11 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
}
}
- if (IS_R300_3D | IS_R500_3D)
+ if (IS_R300_3D || IS_R500_3D)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"num pipes is %d\n", info->num_gb_pipes);
- if (IS_R300_3D | IS_R500_3D) {
+ if (IS_R300_3D || IS_R500_3D) {
uint32_t gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16 |
R300_SUBPIXEL_1_16);
switch(info->num_gb_pipes) {
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 8a1849c..4736e4f 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1978,7 +1978,7 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr pDst,
RADEON_CP_VC_CNTL_VTX_FMT_RADEON_MODE |
(4 << RADEON_CP_VC_CNTL_NUM_SHIFT));
} else {
- if (IS_R300_3D | IS_R500_3D)
+ if (IS_R300_3D || IS_R500_3D)
BEGIN_RING(4 * vtx_count + 4);
else
BEGIN_RING(4 * vtx_count + 2);
@@ -1991,7 +1991,7 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr pDst,
}
#else /* ACCEL_CP */
- if (IS_R300_3D | IS_R500_3D)
+ if (IS_R300_3D || IS_R500_3D)
BEGIN_ACCEL(2 + vtx_count * 4);
else
BEGIN_ACCEL(1 + vtx_count * 4);
@@ -2032,7 +2032,7 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr pDst,
xFixedToFloat(srcTopRight.x) / info->texW[0],
xFixedToFloat(srcTopRight.y) / info->texH[0]);
}
- if (IS_R300_3D | IS_R500_3D)
+ if (IS_R300_3D || IS_R500_3D)
/* flushing is pipelined, free/finish is not */
OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_DC_FLUSH_3D);
@@ -2114,7 +2114,7 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
ENTER_DRAW(0);
- if (IS_R300_3D | IS_R500_3D) {
+ if (IS_R300_3D || IS_R500_3D) {
BEGIN_ACCEL(2);
OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
} else
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index f0dad03..277d9b2 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -643,7 +643,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn,
RADEONPortPrivPtr pPriv
pBox++;
}
- if (IS_R300_3D | IS_R500_3D) {
+ if (IS_R300_3D || IS_R500_3D) {
BEGIN_VIDEO(2);
OUT_VIDEO_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
} else
commit f4292e110105910d0c19bf2db28e2682b27af2c7
Author: Dave Airlie <[EMAIL PROTECTED]>
Date: Fri Jun 20 15:31:43 2008 +1000
Revert "Revert "ATOM: disable TV-out for now""
Oops I really didn't mean to do this, I was testing something and it slipped
past.
This reverts commit dd18caa4b2efc430eaae0c4362b65641f9bef440.
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 900e928..20aa722 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1787,6 +1787,13 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable
(ScrnInfoPtr pScrn)
continue;
}
#endif
+#if 1
+ if (i == ATOM_DEVICE_TV1_INDEX) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Skipping TV-Out\n");
+ info->BiosConnector[i].valid = FALSE;
+ continue;
+ }
+#endif
info->BiosConnector[i].valid = TRUE;
info->BiosConnector[i].output_id = ci.sucI2cId.sbfAccess.bfI2C_LineMux;
commit bb1cfcbfbc1ace1f257fc3bf6401501f1a6da827
Author: Alex Deucher <[EMAIL PROTECTED]>
Date: Wed Jun 25 15:50:16 2008 -0400
RADEON: adjustments to Jerome's last commit
- Flush caches and wait for idle after drawing
- Make sure 3D is idle too (after composite or textured video)
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 0193a28..f461f3c 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -323,7 +323,7 @@ do {
\
case EXA_ENGINEMODE_UNKNOWN: \
wait_until |= RADEON_WAIT_HOST_IDLECLEAN |
RADEON_WAIT_3D_IDLECLEAN; \
case EXA_ENGINEMODE_2D: \
- wait_until |= RADEON_WAIT_2D_IDLECLEAN; \
+ wait_until |= RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_DMA_GUI_IDLE;
\
case EXA_ENGINEMODE_3D: \
break; \
} \
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index 29f7c36..56de23e 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -116,11 +116,6 @@ FUNC_NAME(RADEONPrepareSolid)(PixmapPtr pPix, int alu,
Pixel pm, Pixel fg)
(RADEON_DST_X_LEFT_TO_RIGHT | RADEON_DST_Y_TOP_TO_BOTTOM));
OUT_ACCEL_REG(RADEON_DST_PITCH_OFFSET, dst_pitch_offset);
FINISH_ACCEL();
- BEGIN_ACCEL(2);
- OUT_ACCEL_REG(RADEON_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH_ALL);
- OUT_ACCEL_REG(RADEON_WAIT_UNTIL,
- RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_DMA_GUI_IDLE);
- FINISH_ACCEL();
return TRUE;
}
@@ -129,7 +124,6 @@ FUNC_NAME(RADEONPrepareSolid)(PixmapPtr pPix, int alu,
Pixel pm, Pixel fg)
static void
FUNC_NAME(RADEONSolid)(PixmapPtr pPix, int x1, int y1, int x2, int y2)
{
-
RINFO_FROM_SCREEN(pPix->drawable.pScreen);
ACCEL_PREAMBLE();
@@ -144,7 +138,16 @@ FUNC_NAME(RADEONSolid)(PixmapPtr pPix, int x1, int y1, int
x2, int y2)
static void
FUNC_NAME(RADEONDoneSolid)(PixmapPtr pPix)
{
+ RINFO_FROM_SCREEN(pPix->drawable.pScreen);
+ ACCEL_PREAMBLE();
+
TRACE;
+
+ BEGIN_ACCEL(2);
+ OUT_ACCEL_REG(RADEON_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH_ALL);
+ OUT_ACCEL_REG(RADEON_WAIT_UNTIL,
+ RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_DMA_GUI_IDLE);
+ FINISH_ACCEL();
}
void
@@ -174,11 +177,6 @@ FUNC_NAME(RADEONDoPrepareCopy)(ScrnInfoPtr pScrn, uint32_t
src_pitch_offset,
OUT_ACCEL_REG(RADEON_DST_PITCH_OFFSET, dst_pitch_offset);
OUT_ACCEL_REG(RADEON_SRC_PITCH_OFFSET, src_pitch_offset);
FINISH_ACCEL();
- BEGIN_ACCEL(2);
- OUT_ACCEL_REG(RADEON_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH_ALL);
- OUT_ACCEL_REG(RADEON_WAIT_UNTIL,
- RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_DMA_GUI_IDLE);
- FINISH_ACCEL();
}
static Bool
@@ -216,7 +214,6 @@ FUNC_NAME(RADEONCopy)(PixmapPtr pDst,
int dstX, int dstY,
int w, int h)
{
-
RINFO_FROM_SCREEN(pDst->drawable.pScreen);
ACCEL_PREAMBLE();
@@ -243,7 +240,16 @@ FUNC_NAME(RADEONCopy)(PixmapPtr pDst,
static void
FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst)
{
+ RINFO_FROM_SCREEN(pDst->drawable.pScreen);
+ ACCEL_PREAMBLE();
+
TRACE;
+
+ BEGIN_ACCEL(2);
+ OUT_ACCEL_REG(RADEON_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH_ALL);
+ OUT_ACCEL_REG(RADEON_WAIT_UNTIL,
+ RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_DMA_GUI_IDLE);
+ FINISH_ACCEL();
}
static Bool
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 2319e3b..8a1849c 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -2114,18 +2114,13 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr
pDst)
ENTER_DRAW(0);
- if (IS_R500_3D || ((info->ChipFamily == CHIP_FAMILY_RS400) ||
- (info->ChipFamily == CHIP_FAMILY_RS480) ||
- (info->ChipFamily == CHIP_FAMILY_RS600) ||
- (info->ChipFamily == CHIP_FAMILY_RS690) ||
- (info->ChipFamily == CHIP_FAMILY_RS740))) {
- /* r500 shows corruption on small things like glyphs without a 3D idle
- * IGP shows more substantial corruption
- */
+ if (IS_R300_3D | IS_R500_3D) {
+ BEGIN_ACCEL(2);
+ OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
+ } else
BEGIN_ACCEL(1);
- OUT_ACCEL_REG(RADEON_WAIT_UNTIL, RADEON_WAIT_3D_IDLECLEAN);
- FINISH_ACCEL();
- }
+ OUT_ACCEL_REG(RADEON_WAIT_UNTIL, RADEON_WAIT_3D_IDLECLEAN);
+ FINISH_ACCEL();
LEAVE_DRAW(0);
}
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index d5d1b1c..f0dad03 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -117,7 +117,10 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn,
RADEONPortPrivPtr pPriv
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
