ChangeLog | 286 ++++++++++++++++++++++++++
Makefile.in | 2
configure | 274 ++++++++++++++++++++++---
configure.ac | 12 +
debian/changelog | 6
debian/patches/01_gen_pci_ids.diff | 10
man/Makefile.in | 2
src/Makefile.am | 21 +
src/Makefile.in | 102 +++++----
src/ati.c | 62 +++++
src/atidri.c | 25 +-
src/atimach64probe.c | 2
src/atipciids.h | 2
src/atipcirename.h | 122 +++++++++++
src/atipreinit.c | 126 +++++------
src/atiprint.c | 10
src/atiprobe.c | 75 +++----
src/atistruct.h | 2
src/atividmem.c | 122 +++++++++++
src/r128_probe.c | 2
src/radeon.h | 16 +
src/radeon_accel.c | 2
src/radeon_bios.c | 393 ++++++++++++++-----------------------
src/radeon_chipset.h | 2
src/radeon_display.c | 5
src/radeon_dri.c | 22 +-
src/radeon_driver.c | 205 +++++++++++--------
src/radeon_exa.c | 2
src/radeon_exa_funcs.c | 19 +
src/radeon_modes.c | 113 +++++++---
src/radeon_output.c | 150 ++++++++++++--
src/radeon_probe.c | 4
src/radeon_probe.h | 5
src/radeon_reg.h | 4
src/radeon_video.c | 6
35 files changed, 1595 insertions(+), 618 deletions(-)
New commits:
commit c73e5b439b033c4ba68fb997a37ca873df80eacb
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Oct 6 03:01:45 2007 +0200
New upstream release candidate.
diff --git a/ChangeLog b/ChangeLog
index 0872b77..4e945d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,189 @@
+commit 83d7506a603889b6c18736cff9b2cd3296c95c84
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Fri Oct 5 20:25:04 2007 -0400
+
+ Bump for RC release
+
+commit fe66cc4e02a52e1d014ae5de192c65e8abd7f58a
+Author: Tormod Volden <[EMAIL PROTECTED]>
+Date: Fri Oct 5 20:10:55 2007 -0400
+
+ RADEON: rename to PCI_CHIP_RS485_5975 everywhere
+
+ RS482_5975 is actually RS485. see bug 12048
+
+commit 314e8fdbe5369e4c1786d176d03d0d2a046f25d5
+Author: Tormod Volden <[EMAIL PROTECTED]>
+Date: Fri Oct 5 20:05:54 2007 -0400
+
+ RADEON: Disable DRI by default for RS482 cards
+
+ fixes bug 12048
+
+commit abbafe6db7c0d24efc61a05950d4214c00d3f043
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Thu Oct 4 11:33:09 2007 +0200
+
+ radeon: Fix compile warnings.
+
+commit 1110957ba703475847b8e72023c6edcbd1068aef
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Thu Oct 4 11:32:48 2007 +0200
+
+ radeon: Fix for pci-rework.
+
+ Surprisingly easy, thanks to George's pci-rework changes.
+
+commit 7addf41885ec5658f531624a9c24ea5bd7d22d19
+Merge: 3a958ba... 78c6bd3...
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Thu Oct 4 11:06:08 2007 +0200
+
+ Merge remote branch 'origin/pci-rework'
+
+commit 3a958ba136c3fae5a4ddd56373ac7cd47046f10e
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Wed Oct 3 22:59:14 2007 -0400
+
+ RADEON: remove some cruft
+
+commit b6bda79f72df5e5bf9c6b71fa3298e765da506bd
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Wed Oct 3 22:56:27 2007 -0400
+
+ RADEON: more fixes for single crtc chips
+
+commit 5f5c4e6ad61c45c24f1443b91b4bc5375efdebc0
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Wed Oct 3 22:46:21 2007 -0400
+
+ RADEON: remove RADEONSaveMode()
+
+ It's only called by RADEONSave(), so just move its
+ contents into RADEONSave(). this mirrors RADEONRestore().
+
+commit bfede412b3a3cd11769a580b167c528734146096
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Wed Oct 3 22:19:16 2007 -0400
+
+ RADEON: minor fixes for external TMDS
+
+commit 597dffce9bdc200003d0be880235258386a0bdd7
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Wed Oct 3 21:43:08 2007 -0400
+
+ RADEON: final fix for RMX/LVDS
+
+ It seems that on quite a few laptops the LVDS H/V timing
+ from the bios tables are way off or just doesn't work period.
+ Either we are using it wrong or we need some additional checks
+ when we parse it. Only the dot clock seems to really matter,
+ so use cvt modes and update the dotclock. This seems to work
+ correctly in all cases.
+
+commit cc0c2d8e61600652b1f9cb3dc49db2ef62b1e40d
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Wed Oct 3 00:59:37 2007 -0400
+
+ RADEON: Finally sort out LVDS modes
+
+ - The panel timing from the bios tables is for the crtc,
+ not the native panel mode, so add cvt modes for the panel
+ and fix up the crtc values in mode_fixup().
+ - rename and reconfigure RADEONValidateFPModes() to what it
+ really does: add screen modes. I suppose for backwards
+ compatibility we ought to add the screen modes to every
+ reasonable output, but everyone should really use xrandr
+ or an output monitor section to add custom modes. Hopefully
+ this will go away at some point.
+
+commit 0ca184c3c35032df39ea7ce5d2d4aba1a97b6426
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Tue Oct 2 19:38:18 2007 -0400
+
+ RADEON: fix RADEONInitDispBandwidth() on single crtc cards
+
+ Should fix bug 12490
+
+commit a5fb2a5d54cdd562a97881cdea1a4af35b483aab
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Mon Oct 1 08:48:27 2007 +1000
+
+ radeon: fix powerpc build
+
+commit 22519fde1e002f28d6036d448fcd18452d00f1bb
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Sun Sep 30 13:11:20 2007 -0400
+
+ RADEON: add support for ext tmds table and ext tmds chip init
+
+ This probably won't work on all chips as the various gpio lines
+ seem to need special magic to to actually talk to the i2c slave
+ chips.
+
+commit dcc376e2d2a13329dd03f1bc4b471329757a6f5f
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Wed Sep 26 23:27:38 2007 -0400
+
+ RADEON: remove cruft
+
+commit 99ceaefa18c6e07b55106cca0ea8996fa73667be
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Sep 30 12:02:54 2007 -0400
+
+ RADEON: more work on LVDS mode validation and fixups
+
+ Hopefully this will fix up the weird mode issues with LVDS and
+ native and RMX modes, but I can't seem to get quite the right
+ combo to fix everyone.
+
+commit d808781d48adf01e80b5bb476bae2d2f599030f1
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Fri Sep 28 14:50:42 2007 +1000
+
+ rc410: disable DRI by default due to it not working
+
+commit 4d9f944e40c6b9ac7e80428dff49c6e83fda1d8f
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Thu Sep 27 17:50:15 2007 +0200
+
+ radeon: Fix build on little endian platforms.
+
+ This was accidentally broken when moving away from using pixmap data
pointers
+ directly.
+
+commit 5902e913010a2fb0c17efe01f9aade73f9646f16
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Thu Sep 27 12:53:34 2007 +0200
+
+ radeon: EXA pitch fixes.
+
+ The combined pitch/offset registers only support pitches up to 16320 bytes.
+
+ With EXA >= 2.3, set the maxPitchBytes field accordingly. With older
versions,
+ limit maxX such that the pitch of 32bpp pixmaps doesn't exceed the limit.
+
+ Also check the limit in RADEONGetOffsetPitch just in case.
+
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12551 .
+
+commit ca728973bce504e03bf6228d18287906c35eaa3f
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Thu Sep 27 11:14:21 2007 +0200
+
+ radeon: Don't use pixmap data pointer directly with EXA.
+
+ Fixes segfault with current xserver master without AccelDFS.
+
+commit 21593d04d222b05dbba9abd31eaa3bfb91d999b6
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Mon Sep 24 23:01:20 2007 -0400
+
+ RADEON: more clean up of mode code
+
+ also print out LVDS mode info from bios for both
+ legacy and atom bioses
+
commit 22cccb99d762567757d3fd38795f71e943f1faf9
Author: Alex Deucher <[EMAIL PROTECTED](none)>
Date: Mon Sep 24 00:10:01 2007 -0400
@@ -227,6 +413,16 @@ Date: Sat Sep 15 11:39:47 2007 -0400
Leave them as programmed by the bios
fixes bug 12424
+commit 78c6bd305f2ea70629d1dda3c0c48c067451f5fb
+Author: George Sapountzis <[EMAIL PROTECTED]>
+Date: Mon Sep 10 19:00:16 2007 +0300
+
+ [mach64] Revert to multiple mappings per BAR.
+
+ libpciaccess added subrange mappings and mtrr handling.
+
+ compile-tested only.
+
commit 0241cac643fa1c08a45ea44f5c670b290e760ad8
Author: Michel Dänzer <[EMAIL PROTECTED]>
Date: Sat Sep 8 00:22:40 2007 +0200
@@ -289,6 +485,25 @@ Date: Tue Aug 28 23:08:20 2007 -0400
RADEON: remove some cruft forgotten in a previous commit
+commit 6ff0645ecfe65727e8ef5d5e6215b4e03078e1a5
+Author: George Sapountzis <[EMAIL PROTECTED]>
+Date: Tue Aug 28 15:37:11 2007 +0300
+
+ [mach64] Convert to pci-rework, keeping source-code compatibility.
+
+ It still uses the old probe method though, this is due to the ati wrapper.
+
+commit 7b38d9a1209f87255e5bb0aefe46a363ce4fb6ef
+Merge: 2e3d43a... 673f799...
+Author: George Sapountzis <[EMAIL PROTECTED]>
+Date: Tue Aug 28 16:01:12 2007 +0300
+
+ Merge branch 'master' into pci-rework
+
+ Conflicts:
+
+ src/ati.c
+
commit 673f799729824f4439dd5f681f75dd5aab50947f
Author: Alex Deucher <[EMAIL PROTECTED](none)>
Date: Tue Aug 28 00:42:30 2007 -0400
@@ -2225,6 +2440,77 @@ Date: Fri Mar 23 21:30:19 2007 +0200
Probe for atimisc last to avoid needless loading in most cases (r128,
radeon).
+commit 2e3d43af1e5077cc61dd8668551a6291368d9ed2
+Author: George Sapountzis <[EMAIL PROTECTED]>
+Date: Mon Mar 19 19:05:04 2007 +0200
+
+ [mach64] Compute MMIO address once for each case (PIO, MMIO).
+
+ For an MMIO-only driver, the extra MMIO address probing is not needed
since we
+ already compute the MMIO address during probe and do not make any BIOS
calls.
+
+ For a PIO driver, this extra probing could even result in a wrong MMIO
address
+ since the checking is done by reading through PIO, not MMIO. The MMIO
address
+ is later corrected but having the extra probe there is useless.
+
+commit e7defc0e930f1b2d83623a769b2bfdb05c66a5fe
+Author: George Sapountzis <[EMAIL PROTECTED]>
+Date: Mon Mar 19 19:04:10 2007 +0200
+
+ [mach64] Move setting of PIO and MMIO addresses up, after BIOS init.
+
+ Partially revert "Minor refactoring of pATI->Block0Base computation."
+
+ This parially reverts commit 2c8b33b761e4411451aea1eea3a89d629aeea40d.
+
+commit 3dfdba195f1ff794ab00585ab80e7ea6ac92fcf4
+Author: George Sapountzis <[EMAIL PROTECTED]>
+Date: Sun Mar 18 16:40:07 2007 +0200
+
+ [mach64] Make mapping code friendlier to pci-rework source-code
compatibility.
+
+commit 321db6d87c9110654ab386e5ec270116eca1e04f
+Author: George Sapountzis <[EMAIL PROTECTED]>
+Date: Sun Mar 18 16:15:20 2007 +0200
+
+ [mach64] Add macros for pci-rework source-code compatibilty.
+
+commit dfd07b6e99020d1db43d7ce0cae4423d8c6b1f05
+Author: George Sapountzis <[EMAIL PROTECTED]>
+Date: Sun Mar 18 16:38:26 2007 +0200
+
+ [mach64] Drop checking that BAR base + size fits in 32 bit.
+
+ I can't see how these tests could fail on 32-bit. OTOH they are potentially
+ problematic with 64-bit PCI addresses.
+
+commit e674338a98c50800637b8ebc01adf3aec2a3eb38
+Author: George Sapountzis <[EMAIL PROTECTED]>
+Date: Sun Mar 18 15:50:41 2007 +0200
+
+ [mach64] Single mapping per BAR.
+
+ - We reset write-combining of the FB when MMIO registers fall in the linear
+ aperture.
+
+ - We set MMIOInLinear in all three aperture mappings since the mapping code
+ depends on it.
+
+ - We map the linear aperture in its entirety for MMIOInLinear also.
+ This simplifies mapping of HW cursor and the LE aperture on BE archs, as
+ they always fall in the linear aperture.
+
+ - I assumed that BAR[2] is page-aligned (we know it's 4K-aligned for sure).
+
+commit e7969de8ec572d8801806f9525a9a081a58a03f1
+Author: George Sapountzis <[EMAIL PROTECTED]>
+Date: Sun Mar 18 15:35:25 2007 +0200
+
+ [mach64] Drop poking the VGA MMIO aperture.
+
+ We will not be able to handle this when we do mappings for PCI BARs only
and
+ it should be handled with a CPIO driver anyway.
+
commit 166c760a86165330175023e07c4b2bd6891633c5
Author: Michel Dänzer <[EMAIL PROTECTED]>
Date: Tue Mar 20 09:16:02 2007 +0100
diff --git a/Makefile.in b/Makefile.in
index 0d5a2da..a804cae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,6 +160,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
diff --git a/configure b/configure
index f568204..e72be6b 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.7.194.
+# Generated by GNU Autoconf 2.61 for xf86-video-ati 6.7.195.
#
# 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.7.194'
-PACKAGE_STRING='xf86-video-ati 6.7.194'
+PACKAGE_VERSION='6.7.195'
+PACKAGE_STRING='xf86-video-ati 6.7.195'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -889,6 +889,10 @@ ATIMISC_TV_OUT_TRUE
ATIMISC_TV_OUT_FALSE
USE_EXA_TRUE
USE_EXA_FALSE
+PCIACCESS_CFLAGS
+PCIACCESS_LIBS
+XSERVER_LIBPCIACCESS_TRUE
+XSERVER_LIBPCIACCESS_FALSE
moduledir
DRIVER_NAME
APP_MAN_SUFFIX
@@ -935,7 +939,9 @@ PKG_CONFIG
XORG_CFLAGS
XORG_LIBS
DRI_CFLAGS
-DRI_LIBS'
+DRI_LIBS
+PCIACCESS_CFLAGS
+PCIACCESS_LIBS'
# Initialize some variables set by options.
@@ -1438,7 +1444,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.7.194 to adapt to many kinds of
systems.
+\`configure' configures xf86-video-ati 6.7.195 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1508,7 +1514,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-ati 6.7.194:";;
+ short | recursive ) echo "Configuration of xf86-video-ati 6.7.195:";;
esac
cat <<\_ACEOF
@@ -1559,6 +1565,10 @@ Some influential environment variables:
XORG_LIBS linker flags for XORG, overriding pkg-config
DRI_CFLAGS C compiler flags for DRI, overriding pkg-config
DRI_LIBS linker flags for DRI, overriding pkg-config
+ PCIACCESS_CFLAGS
+ C compiler flags for PCIACCESS, overriding pkg-config
+ PCIACCESS_LIBS
+ linker flags for PCIACCESS, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1624,7 +1634,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-ati configure 6.7.194
+xf86-video-ati configure 6.7.195
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1638,7 +1648,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.7.194, which was
+It was created by xf86-video-ati $as_me 6.7.195, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2333,7 +2343,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-ati'
- VERSION='6.7.194'
+ VERSION='6.7.195'
cat >>confdefs.h <<_ACEOF
@@ -4402,7 +4412,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4405 "configure"' > conftest.$ac_ext
+ echo '#line 4415 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7144,11 +7154,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7147: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7157: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7151: \$? = $ac_status" >&5
+ echo "$as_me:7161: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7434,11 +7444,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7437: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7447: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7441: \$? = $ac_status" >&5
+ echo "$as_me:7451: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7538,11 +7548,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7541: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7551: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7545: \$? = $ac_status" >&5
+ echo "$as_me:7555: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9900,7 +9910,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9903 "configure"
+#line 9913 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10000,7 +10010,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10003 "configure"
+#line 10013 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12420,11 +12430,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12423: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12433: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12427: \$? = $ac_status" >&5
+ echo "$as_me:12437: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12524,11 +12534,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12527: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12537: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12531: \$? = $ac_status" >&5
+ echo "$as_me:12541: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14101,11 +14111,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14104: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14114: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14108: \$? = $ac_status" >&5
+ echo "$as_me:14118: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14205,11 +14215,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14208: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14218: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14212: \$? = $ac_status" >&5
+ echo "$as_me:14222: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16405,11 +16415,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16408: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16418: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16412: \$? = $ac_status" >&5
+ echo "$as_me:16422: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16695,11 +16705,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16698: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16708: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16702: \$? = $ac_status" >&5
+ echo "$as_me:16712: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16799,11 +16809,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16802: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16812: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16806: \$? = $ac_status" >&5
+ echo "$as_me:16816: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21673,6 +21683,66 @@ _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
+ 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"
+
+int
+main ()
+{
+#ifndef XSERVER_LIBPCIACCESS
+ (void) XSERVER_LIBPCIACCESS;
+#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_XSERVER_LIBPCIACCESS=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_XSERVER_LIBPCIACCESS=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&5
+echo "${ECHO_T}$ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&6; }
+if test $ac_cv_have_decl_XSERVER_LIBPCIACCESS = yes; then
+ XSERVER_LIBPCIACCESS=yes
+else
+ XSERVER_LIBPCIACCESS=no
+fi
+
+
CPPFLAGS="$SAVE_CPPFLAGS"
if test "x$USE_EXA" = xyes; then
@@ -21684,6 +21754,129 @@ else
fi
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for PCIACCESS" >&5
+echo $ECHO_N "checking for PCIACCESS... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PCIACCESS_CFLAGS"; then
+ pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.8.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.8.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.8.0"
2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PCIACCESS_LIBS"; then
+ pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.8.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.8.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.8.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "pciaccess >= 0.8.0"`
+ else
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "pciaccess >= 0.8.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PCIACCESS_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (pciaccess >=
0.8.0) were not met:
+
+$PCIACCESS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (pciaccess >= 0.8.0) were not met:
+
+$PCIACCESS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be
found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.
Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
+ PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ XSERVER_LIBPCIACCESS_TRUE=
+ XSERVER_LIBPCIACCESS_FALSE='#'
+else
+ XSERVER_LIBPCIACCESS_TRUE='#'
+ XSERVER_LIBPCIACCESS_FALSE=
+fi
+
+
@@ -22131,6 +22324,13 @@ echo "$as_me: error: conditional \"USE_EXA\" was never
defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${XSERVER_LIBPCIACCESS_TRUE}" && test -z
"${XSERVER_LIBPCIACCESS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"XSERVER_LIBPCIACCESS\" was
never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"XSERVER_LIBPCIACCESS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${BUILD_LINUXDOC_TRUE}" && test -z "${BUILD_LINUXDOC_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_LINUXDOC\" was never
defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -22445,7 +22645,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.7.194, which was
+This file was extended by xf86-video-ati $as_me 6.7.195, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22498,7 +22698,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-ati config.status 6.7.194
+xf86-video-ati config.status 6.7.195
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
@@ -22840,6 +23040,10 @@ ATIMISC_TV_OUT_TRUE!$ATIMISC_TV_OUT_TRUE$ac_delim
ATIMISC_TV_OUT_FALSE!$ATIMISC_TV_OUT_FALSE$ac_delim
USE_EXA_TRUE!$USE_EXA_TRUE$ac_delim
USE_EXA_FALSE!$USE_EXA_FALSE$ac_delim
+PCIACCESS_CFLAGS!$PCIACCESS_CFLAGS$ac_delim
+PCIACCESS_LIBS!$PCIACCESS_LIBS$ac_delim
+XSERVER_LIBPCIACCESS_TRUE!$XSERVER_LIBPCIACCESS_TRUE$ac_delim
+XSERVER_LIBPCIACCESS_FALSE!$XSERVER_LIBPCIACCESS_FALSE$ac_delim
moduledir!$moduledir$ac_delim
DRIVER_NAME!$DRIVER_NAME$ac_delim
APP_MAN_SUFFIX!$APP_MAN_SUFFIX$ac_delim
@@ -22868,7 +23072,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/debian/changelog b/debian/changelog
index c66bc5d..098eb43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.7.195-1) experimental; urgency=low
+
+ * New upstream release candidate.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 06 Oct 2007 02:56:56 +0200
+
xserver-xorg-video-ati (1:6.7.194-1) experimental; urgency=low
* New upstream release candidate.
diff --git a/debian/patches/01_gen_pci_ids.diff
b/debian/patches/01_gen_pci_ids.diff
index 93dedaa..0bd0d92 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -4,12 +4,12 @@
Index: xserver-xorg-video-ati/src/Makefile.am
===================================================================
---- xserver-xorg-video-ati.orig/src/Makefile.am 2007-08-23
08:14:37.000000000 +0200
-+++ xserver-xorg-video-ati/src/Makefile.am 2007-08-23 08:25:14.000000000
+0200
-@@ -187,3 +187,9 @@
- theatre.h \
+--- 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
+@@ -192,3 +192,9 @@
theatre_reg.h \
- atipciids.h
+ atipciids.h \
+ atipcirename.h
+
+pcidatadir = $(datadir)/xserver-xorg/pci
+pcidata_DATA = ati.ids
diff --git a/man/Makefile.in b/man/Makefile.in
index f4b21c9..a643122 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -150,6 +150,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
diff --git a/src/Makefile.in b/src/Makefile.in
index 4137713..c298884 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -131,13 +131,17 @@ r128_drv_la_LIBADD =
am__r128_drv_la_SOURCES_DIST = r128_accel.c r128_cursor.c r128_dga.c \
r128_driver.c r128_video.c r128_misc.c r128_probe.c r128_dri.c
@[EMAIL PROTECTED] = r128_dri.lo
-am_r128_drv_la_OBJECTS = r128_accel.lo r128_cursor.lo r128_dga.lo \
- r128_driver.lo r128_video.lo r128_misc.lo r128_probe.lo \
- $(am__objects_5)
[EMAIL PROTECTED]@am_r128_drv_la_OBJECTS = r128_accel.lo \
[EMAIL PROTECTED]@ r128_cursor.lo r128_dga.lo \
[EMAIL PROTECTED]@ r128_driver.lo r128_video.lo \
[EMAIL PROTECTED]@ r128_misc.lo r128_probe.lo \
[EMAIL PROTECTED]@ $(am__objects_5)
r128_drv_la_OBJECTS = $(am_r128_drv_la_OBJECTS)
r128_drv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(r128_drv_la_LDFLAGS) $(LDFLAGS) -o $@
[EMAIL PROTECTED]@am_r128_drv_la_rpath = -rpath \
[EMAIL PROTECTED]@ $(r128_drv_ladir)
radeon_drv_la_LIBADD =
am__radeon_drv_la_SOURCES_DIST = radeon_accel.c radeon_cursor.c \
radeon_dga.c radeon_driver.c radeon_video.c radeon_bios.c \
@@ -156,26 +160,39 @@ radeon_drv_la_LINK = $(LIBTOOL) --tag=CC
$(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(radeon_drv_la_LDFLAGS) $(LDFLAGS) -o $@
theatre200_drv_la_LIBADD =
-am_theatre200_drv_la_OBJECTS = theatre200_drv_la-theatre200.lo \
- theatre200_drv_la-theatre200_module.lo
+am__theatre200_drv_la_SOURCES_DIST = theatre200.c theatre200_module.c
[EMAIL PROTECTED]@am_theatre200_drv_la_OBJECTS = \
[EMAIL PROTECTED]@ theatre200_drv_la-theatre200.lo \
[EMAIL PROTECTED]@ theatre200_drv_la-theatre200_module.lo
theatre200_drv_la_OBJECTS = $(am_theatre200_drv_la_OBJECTS)
theatre200_drv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(theatre200_drv_la_CFLAGS) $(CFLAGS) \
$(theatre200_drv_la_LDFLAGS) $(LDFLAGS) -o $@
[EMAIL PROTECTED]@am_theatre200_drv_la_rpath = -rpath \
[EMAIL PROTECTED]@ $(theatre200_drv_ladir)
theatre_detect_drv_la_LIBADD =
-am_theatre_detect_drv_la_OBJECTS = theatre_detect.lo \
- theatre_detect_module.lo
+am__theatre_detect_drv_la_SOURCES_DIST = theatre_detect.c \
+ theatre_detect_module.c
[EMAIL PROTECTED]@am_theatre_detect_drv_la_OBJECTS = \
[EMAIL PROTECTED]@ theatre_detect.lo \
[EMAIL PROTECTED]@ theatre_detect_module.lo
theatre_detect_drv_la_OBJECTS = $(am_theatre_detect_drv_la_OBJECTS)
theatre_detect_drv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(theatre_detect_drv_la_LDFLAGS) $(LDFLAGS) -o $@
[EMAIL PROTECTED]@am_theatre_detect_drv_la_rpath = -rpath \
[EMAIL PROTECTED]@ $(theatre_detect_drv_ladir)
theatre_drv_la_LIBADD =
-am_theatre_drv_la_OBJECTS = theatre.lo theatre_module.lo
+am__theatre_drv_la_SOURCES_DIST = theatre.c theatre_module.c
[EMAIL PROTECTED]@am_theatre_drv_la_OBJECTS = theatre.lo \
[EMAIL PROTECTED]@ theatre_module.lo
theatre_drv_la_OBJECTS = $(am_theatre_drv_la_OBJECTS)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
