New upstream snapshot

8 files changed, 179 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 6614356..5a6d3b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,137 @@
+commit 38606b08b68842fbcc81c233009c1117269f3be9
+Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
+Date:   Sat Mar 8 23:22:59 2008 +0100
+
+    Makefile.am: nuke RCS Id
+
+commit 9d710ee1a44cf2f3a948fbdbe17ef09521cbe744
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Fri Mar 7 15:09:14 2008 -0500
+
+    AVIVO: clean up some unused variables
+
+commit c28c30c9f3d7bfebfd56a5c982c96f0090982054
+Author: Alex Deucher <alex@t41p.hsd1.va.comcast.net>
+Date:   Fri Mar 7 14:10:49 2008 -0500
+
+    RADEON: Fix crash in last commit
+
+commit c3a3635865e380c784a226c8ead069d4716d6b75
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu Mar 6 20:17:45 2008 -0500
+
+    RADEON: fix tiling/interlaced interaction with randr 1.2
+
+commit df1b94dc4eb1f35b636dbf2ec0ab1c2da9937c0d
+Author: Alex Deucher <alex@botch2.(none)>
+Date:   Thu Mar 6 19:22:08 2008 -0500
+
+    DCE3: Ignore outputs with DIN connectors for now
+
+commit cb2dc19387c7b6494c47c76d683cf38a48700768
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Thu Mar 6 18:33:12 2008 -0500
+
+    AVIVO: fix typo from a previous commit
+    
+    Leave tv dpms hook disabled or you may get bad interactions
+    with the shared DAC
+
+commit 77355de48057e5e7e0d5b3f3cf5a7a92220a53b1
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Thu Mar 6 17:46:00 2008 -0500
+
+    AVIVO: don't add outputs for invalid connectors
+
+commit 600dbe080997a01ceaf6be86723189d518bc1281
+Merge: 594743a... 5b7875d...
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Thu Mar 6 17:31:37 2008 -0500
+
+    Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati
+
+commit 594743a99811a8b0f391412892414fcd158eeb56
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Thu Mar 6 17:30:21 2008 -0500
+
+    AVIVO: fix up memsize detection for IGP chips
+
+commit 5b7875d0cbfbdbcd1515c4e942d30de298b49dff
+Author: Doug Chapman <doug.chapman@hp.com>
+Date:   Thu Mar 6 14:31:06 2008 -0500
+
+    Bug #14826: Fix a bogus check around xf86SetOperatingState.
+
+commit 651fe23f4c650ed91843dec48db24e18e8b91219
+Merge: 3de2dc8... 766f464...
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Mar 6 14:28:27 2008 -0500
+
+    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-ati
+
+commit 41171c25cd235bafad26bcbabced16ead4b8c54b
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Thu Mar 6 14:05:18 2008 -0500
+
+    DCE3.0: add support for crtc memreq table
+
+commit 766f464dfdfccadef23e4232f2bce5db22195513
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Thu Mar 6 13:35:43 2008 -0500
+
+    RADEON: take 2 on proper pragma pack support for bsds
+    
+    See bug 14594.  Based on suggestion by Henry Zhao
+
+commit a842ce9ca6494e724a7828cead9b61c9ef02b6aa
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Thu Mar 6 12:32:18 2008 -0500
+
+    DCE3.0: Minor fixups
+
+commit 8a1ba374033591c725a78923aa30829e4de2a5ae
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Thu Mar 6 09:53:51 2008 -0500
+
+    RADEON: option to override TVDAC adj values from bios with driver defaults
+    
+    If you have a washed out image on the tv dac, try this option.
+    Option "DefaultTVDACAdj" "TRUE"
+
+commit 0ed48f8f651a28e189f9fee8c6b593da0178d21c
+Author: Alex Deucher <alex@cube.(none)>
+Date:   Wed Mar 5 18:41:01 2008 -0500
+
+    AVIVO: Initial support for DCE 3.0 using atombios
+    
+    DACs are working well, DIG support (DVI, HDMI, LVDS, etc.)
+    still has some issues.
+
+commit 2901e99f1942842856cd39c1dcc8b22f3cf7d9e3
+Author: Alex Deucher <alex@botch2.(none)>
+Date:   Wed Mar 5 10:40:06 2008 -0500
+
+    RADEON: fix fetching of dac2 adj values from newer bios tables
+
+commit 74eb981287d76836327830bd51272f605a07e0cc
+Author: Alex Deucher <alex@botch2.(none)>
+Date:   Mon Mar 3 12:02:44 2008 -0500
+
+    ATOMBIOS: fix atombios parser support on *bsd
+    
+    bsd requires a different pragma pack than Linux.
+    See bug 14594.
+
+commit f7769ea86e265f347eb58c517ccb5ef8b35eec27
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Sun Mar 2 14:49:21 2008 -0500
+
+    [PATCH] Ensure symbols used by other modules are visible.
+    
+    The xf86-video-ati drivers are one of the cases where LoaderSymbol is
+    widely used in some obscure ways. This patch fixes the problem, and
+    allows compiling with -fvisibility=hidden.
+
 commit a4398ac3ad77216f2c8aa628425bef5f2912a0a9
 Author: Alex Deucher <alex@cube.(none)>
 Date:   Sat Mar 1 18:52:26 2008 -0500
@@ -896,6 +1030,16 @@ Date:   Fri Jan 18 20:11:57 2008 +1000
 
     fixup register 6594 save/restore
 
+commit 3de2dc88cf26ff5932f11cecdf975777b8aa2a4a
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jan 16 14:55:05 2008 -0500
+
+    Bump CRTC size limits on AVIVO chips so 30" displays work without tweaking.
+    
+    Note that the CRTC size limits we're using right now are _not_ the
+    hardware limits, they're just heuristics until we can resize the front
+    buffer properly.
+
 commit 2a89a31481d71a56a9930073cf99d3ae7b4290e1
 Author: Alex Deucher <alex@samba.(none)>
 Date:   Thu Jan 17 15:08:17 2008 -0500
diff --git a/aclocal.m4 b/aclocal.m4
index aa6547f..ef947f1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6876,7 +6876,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
 	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
 	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-	[XORG_MACROS_version=1.1.5
+	[XORG_MACROS_version=1.1.6
 	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
 	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7025,7 +7025,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
 XORG_SGML_PATH=$prefix/share/sgml
 HAVE_DEFS_ENT=
 
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+  HAVE_DEFS_ENT=no
+else
+  AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
 
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -7346,14 +7350,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
 		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
 		[Major version of this package])
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
 		[$PVM],
 		[Minor version of this package])
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
diff --git a/config.h.in b/config.h.in
index fdafa10..91eecd1 100644
--- a/config.h.in
+++ b/config.h.in
@@ -5,6 +5,9 @@
 /* Use Damage extension */
 #undef DAMAGE
 
+/* Use linux pragma pack */
+#undef FGL_LINUX
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
diff --git a/configure b/configure
index a5648c4..6262e98 100755
--- a/configure
+++ b/configure
@@ -22412,6 +22412,15 @@ else
 fi
 
 
+case $host_os in
+  *linux*)
+
+cat >>confdefs.h <<\_ACEOF
+#define FGL_LINUX 1
+_ACEOF
+ ;;
+esac
+
 
 
 
@@ -22510,7 +22519,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
 _ACEOF
 
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
@@ -22519,7 +22528,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MINOR $PVM
 _ACEOF
 
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
@@ -22533,7 +22542,10 @@ _ACEOF
 XORG_SGML_PATH=$prefix/share/sgml
 HAVE_DEFS_ENT=
 
-as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
+if test x"$cross_compiling" = x"yes" ; then
+  HAVE_DEFS_ENT=no
+else
+  as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
 echo $ECHO_N "checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -22556,6 +22568,7 @@ if test `eval echo '${'$as_ac_File'}'` = yes; then
   HAVE_DEFS_ENT=yes
 fi
 
+fi
 
 # Extract the first word of "linuxdoc", so it can be a program name with args.
 set dummy linuxdoc; ac_word=$2
diff --git a/debian/changelog b/debian/changelog
index b15593d..7c2dd2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.8.1~git20080310.38606b08-1) experimental; urgency=low
+
+  * New upstream snapshap, up to commit 38606b08.
+
+ -- Brice Goglin <bgoglin@debian.org>  Mon, 10 Mar 2008 23:48:13 +0100
+
 xserver-xorg-video-ati (1:6.8.1~git20080302.a4398ac3-1) experimental; urgency=low
 
   * New upstream snapshot, after r128 and mach64 got split out.
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
index bb64b5a..7a7dfe7 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -6,7 +6,7 @@ Index: xserver-xorg-video-ati/src/Makefile.am
 ===================================================================
 --- xserver-xorg-video-ati.orig/src/Makefile.am	2007-10-06 02:44:47.000000000 +0200
 +++ xserver-xorg-video-ati/src/Makefile.am	2007-10-06 02:48:34.000000000 +0200
-@@ -152,3 +152,9 @@
+@@ -153,3 +153,9 @@
  	pcidb/ati_pciids.csv \
  	pcidb/parse_pci_ids.pl \
  	radeon_atombios.h
diff --git a/man/Makefile.in b/man/Makefile.in
index 086ca85..9747c7a 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -14,7 +14,6 @@
 
 @SET_MAKE@
 
-# $Id$
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/src/Makefile.in b/src/Makefile.in
index 59bc31a..64b6f69 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -353,7 +353,7 @@ XMODE_SRCS = \
         modes/xf86DiDGA.c
 
 @USE_EXA_TRUE@RADEON_EXA_SOURCES = radeon_exa.c
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER
 INCLUDES = -I$(srcdir)/AtomBios/includes
 ati_drv_la_LTLIBRARIES = ati_drv.la
 ati_drv_la_LDFLAGS = -module -avoid-version