Revert the update to xf86-video-ati 6.14.3. Requested by espie@

who experiemnts regressions with this driver.

4 files changed, 171 insertions, 292 deletions

diff --git a/driver/xf86-video-ati/man/Makefile.am b/driver/xf86-video-ati/man/Makefile.am
index 85337650a..93ff52c76 100644
--- a/driver/xf86-video-ati/man/Makefile.am
+++ b/driver/xf86-video-ati/man/Makefile.am
@@ -1,24 +1,27 @@
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# 
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation.
+# 
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+# 
+# Except as contained in this notice, the name of the copyright holders shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from the copyright holders.
 # 
 
 drivermandir = $(DRIVER_MAN_DIR)
@@ -31,11 +34,25 @@ EXTRA_DIST = @DRIVER_NAME@.man radeon.man
 
 CLEANFILES = $(driverman_DATA)
 
+SED = sed
 
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+  XORGMANNAME = X Version 11
 
+MAN_SUBSTS = \
+	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xservername__|Xorg|g' \
+	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__projectroot__|$(prefix)|g' \
+	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
 .man.$(DRIVER_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+	sed $(MAN_SUBSTS) < $< > $@
diff --git a/driver/xf86-video-ati/man/Makefile.in b/driver/xf86-video-ati/man/Makefile.in
index 71d2175c9..83cd85bd0 100644
--- a/driver/xf86-video-ati/man/Makefile.in
+++ b/driver/xf86-video-ati/man/Makefile.in
@@ -16,25 +16,28 @@
 
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# 
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation.
+# 
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+# 
+# Except as contained in this notice, the name of the copyright holders shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from the copyright holders.
 # 
 
 srcdir = @srcdir@
@@ -46,9 +49,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
-install_sh_PROGRAM = ${SHELL} $(install_sh) -c
-install_sh_SCRIPT = ${SHELL} $(install_sh) -c
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
@@ -86,7 +89,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -94,18 +96,22 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_CFLAGS = @BASE_CFLAGS@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
@@ -113,56 +119,43 @@ DRI_CFLAGS = @DRI_CFLAGS@
 DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
 DRI_TRUE = @DRI_TRUE@
-DRM_MODE_FALSE = @DRM_MODE_FALSE@
-DRM_MODE_TRUE = @DRM_MODE_TRUE@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
-HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
-HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
-INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBDRM_RADEON_CFLAGS = @LIBDRM_RADEON_CFLAGS@
-LIBDRM_RADEON_LIBS = @LIBDRM_RADEON_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
-LIBUDEV_FALSE = @LIBUDEV_FALSE@
-LIBUDEV_LIBS = @LIBUDEV_LIBS@
-LIBUDEV_TRUE = @LIBUDEV_TRUE@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-LIPO = @LIPO@
+LINUXDOC = @LINUXDOC@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MAN_SUBSTS = @MAN_SUBSTS@
+MAKE_HTML = @MAKE_HTML@
+MAKE_PDF = @MAKE_PDF@
+MAKE_PS = @MAKE_PS@
+MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -173,29 +166,29 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
 PCIACCESS_LIBS = @PCIACCESS_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
+PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
-SED = @SED@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STRICT_CFLAGS = @STRICT_CFLAGS@
 STRIP = @STRIP@
 USE_EXA_FALSE = @USE_EXA_FALSE@
 USE_EXA_TRUE = @USE_EXA_TRUE@
 VERSION = @VERSION@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XF86DRM_MODE_FALSE = @XF86DRM_MODE_FALSE@
-XF86DRM_MODE_TRUE = @XF86DRM_MODE_TRUE@
+XMODES_CFLAGS = @XMODES_CFLAGS@
+XMODES_FALSE = @XMODES_FALSE@
+XMODES_TRUE = @XMODES_TRUE@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
-XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
 XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -243,7 +236,21 @@ driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 EXTRA_DIST = @DRIVER_NAME@.man radeon.man
 CLEANFILES = $(driverman_DATA)
 
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+XORGMANNAME = X Version 11
+MAN_SUBSTS = \
+	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xservername__|Xorg|g' \
+	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__projectroot__|$(prefix)|g' \
+	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 all: all-am
 
@@ -258,9 +265,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  man/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  man/Makefile
+	  $(AUTOMAKE) --gnu  man/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -430,7 +437,7 @@ uninstall-am: uninstall-drivermanDATA uninstall-info-am
 
 
 .man.$(DRIVER_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+	sed $(MAN_SUBSTS) < $< > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/driver/xf86-video-ati/man/ati.man b/driver/xf86-video-ati/man/ati.man
index deb775994..614cca258 100644
--- a/driver/xf86-video-ati/man/ati.man
+++ b/driver/xf86-video-ati/man/ati.man
@@ -1,3 +1,4 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ati.man,v 1.2 2001/01/27 18:20:46 dawes Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH ATI __drivermansuffix__ __vendorversion__
@@ -26,6 +27,7 @@ those drivers.  See those manpages for specific cards supported.
 .SH CONFIGURATION DETAILS
 Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details, and the specific card driver for driver configuration details.
+driver.
 .SH "SEE ALSO"
 __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), r128(__drivermansuffix__), radeon(__drivermansuffix__)
 .SH AUTHORS
diff --git a/driver/xf86-video-ati/man/radeon.man b/driver/xf86-video-ati/man/radeon.man
index 55c5d0238..09239cf46 100644
--- a/driver/xf86-video-ati/man/radeon.man
+++ b/driver/xf86-video-ati/man/radeon.man
@@ -1,3 +1,4 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man,v 1.0 2003/01/31 23:04:50 $
 .ds q \N'34'
 .TH RADEON __drivermansuffix__ __vendorversion__
 .SH NAME
@@ -12,23 +13,22 @@ radeon \- ATI RADEON video driver
 .fi
 .SH DESCRIPTION
 .B radeon
-is an __xservername__ driver for ATI RADEON-based video cards with the
+is an __xservername__ driver for ATI RADEON based video cards with the
 following features:
 .PP
 .PD 0
 .TP 2
 \(bu
-Full support for 8-, 15-, 16- and 24-bit pixel depths;
+Full support for 8, 15, 16 and 24 bit pixel depths;
 .TP
 \(bu
 RandR 1.2 and RandR 1.3 support;
 .TP
 \(bu
-TV-out support (only on RV/RS1xx, RV/RS2xx, R/RV/RS3xx. Experimental
+TV-out support (only on R/RV/RS1xx, R/RV/RS2xx, R/RV/RS3xx. Experimental
 support on R/RV5xx, R/RV6xx, and R/RV7xx through the
 .B ATOMTvOut
-option);  TV-out is not supported on cards that use the Rage Theatre
-chip for TV-out (R100, R200).
+option);
 .TP
 \(bu
 Full EXA 2D acceleration;
@@ -40,20 +40,19 @@ R/RV/RS2xx and RS3xx);
 .TP
 \(bu
 Textured XVideo acceleration including anti-tearing support (Bicubic filtering
-only available on R/RV3xx, R/RV/RS4xx, R/RV5xx, and RS6xx/RS740);
+only available on R/RV3xx, R/RV/RS4xx, R/RV5xx, and RS6xx);
 .TP
 \(bu
 Overlay XVideo acceleration (only on R/RV/RS1xx, R/RV/RS2xx,
 R/RV/RS3xx, R/RV/RS4xx);
 .TP
 \(bu
-3D acceleration;
+3D acceleration (not supported on R/RV6xx and R/RV/RS7xx);
 .PD
 .SH SUPPORTED HARDWARE
 The
 .B radeon
-driver supports PCI, AGP, and PCIE video cards based on the following ATI chips
-(note: list is non-exhaustive):
+driver supports PCI, AGP, and PCIE video cards based on the following ATI chips:
 .PP
 .PD 0
 .TP 12
@@ -127,7 +126,7 @@ Radeon X800, M28 PCIE
 Radeon X850 PCIE/AGP
 .TP 12
 .B RV505/RV515/RV516/RV550
-Radeon X1300/X1400/X1500/X1550/X2300
+Radeon X1300/X1400/X1500/X2300
 .TP 12
 .B R520
 Radeon X1800
@@ -145,55 +144,25 @@ Radeon X1200/X1250/X2100
 Radeon HD 2900
 .TP 12
 .B RV610/RV630
-Radeon HD 2400/2600/2700/4200/4225/4250
+Radeon HD 2400/2600
 .TP 12
 .B RV620/RV635
-Radeon HD 3410/3430/3450/3470/3650/3670
+Radeon HD 3450/3470
 .TP 12
 .B RV670
-Radeon HD 3690/3850/3870
+Radeon HD 3850/3870
 .TP 12
-.B RS780/RS880
-Radeon HD 3100/3200/3300/4100/4200/4250/4290
+.B RS780
+Radeon HD 3100/3200/3300
 .TP 12
-.B RV710/RV730
-Radeon HD 4330/4350/4550/4650/4670/5145/5165/530v/545v/560v/565v
+.B RV710
+Radeon HD 4350/4550
 .TP 12
-.B RV740/RV770/RV790
-Radeon HD 4770/4730/4830/4850/4860/4870/4890
+.B RV730
+Radeon HD 4650/4670
 .TP 12
-.B CEDAR
-Radeon HD 5430/5450/6330/6350/6370
-.TP 12
-.B REDWOOD
-Radeon HD 5550/5570/5650/5670/5730/5750/5770/6530/6550/6570
-.TP 12
-.B JUNIPER
-Radeon HD 5750/5770/5830/5850/5870/6750/6770/6830/6850/6870
-.TP 12
-.B CYPRESS
-Radeon HD 5830/5850/5870
-.TP 12
-.B HEMLOCK
-Radeon HD 5970
-.TP 12
-.B PALM
-Radeon HD 6310/6250
-.TP 12
-.B SUMO/SUMO2
-Radeon HD 6370/6380/6410/6480/6520/6530/6550/6620
-.TP 12
-.B BARTS
-Radeon HD 6790/6850/6870/6950/6970/6990
-.TP 12
-.B TURKS
-Radeon HD 6570/6630/6650/6670/6730/6750/6770
-.TP 12
-.B CAICOS
-Radeon HD 6430/6450/6470/6490
-.TP 12
-.B CAYMAN
-Radeon HD 6950/6970/6990
+.B RV770
+Radeon HD 4850/4870
 .PD
 .SH CONFIGURATION DETAILS
 Please refer to __xconfigfile__(__filemansuffix__) for general configuration
@@ -202,7 +171,7 @@ driver.
 .PP
 The driver auto\-detects all device information necessary to initialize
 the card.  However, if you have problems with auto\-detection, you can
-specify for UMS (Userspace Modesetting):
+specify:
 .PP
 .RS 4
 VideoRam \- in kilobytes
@@ -216,11 +185,7 @@ ChipID   \- PCI DEVICE ID
 .PP
 In addition, the following driver
 .B Options
-are supported for both
-.B UMS
-(Userspace Modesetting) and
-.B KMS
-(Kernel Modesetting):
+are supported:
 .TP
 .BI "Option \*qSWcursor\*q \*q" boolean \*q
 Selects software cursor.  The default is
@@ -233,71 +198,6 @@ The default is to
 .B enable
 hardware acceleration.
 .TP
-.BI "Option \*qZaphodHeads\*q \*q" string \*q
-Specify the RandR output(s) to use with zaphod mode for a particular driver
-instance.  If you use this option you must use this option for all instances
-of the driver.
-.br
-For example:
-.B
-Option \*qZaphodHeads\*q \*qLVDS,VGA-0\*q
-will assign xrandr outputs LVDS and VGA-0 to this instance of the driver.
-.TP
-.BI "Option \*qEXAVSync\*q \*q" boolean \*q
-This option attempts to avoid tearing by stalling the engine until the display
-controller has passed the destination region.  It reduces tearing at the cost
-of performance and has been known to cause instability on some chips.
-The default is
-.B off.
-
-.PP
-The following driver
-.B Options
-are supported for
-.B KMS
-(Kernel Modesetting):
-.TP
-.BI "Option \*qColorTiling\*q \*q" "boolean" \*q
-The framebuffer can be addressed either in linear or tiled mode. Tiled mode can provide
-significant performance benefits with 3D applications.  Tiling will be disabled if the drm
-module is too old or if the current display configuration does not support it. KMS
-ColorTiling is not currently supported on R/RV/RS1XX, R/RV/RS2XX, and RS3XX.
-.br
-The default value is
-.B on
-for R/RV3XX, R/RV4XX, R/RV5XX, RS6XX, RS740, R/RV6XX, R/RV7XX, RS780, RS880,
-EVERGREEN, and CAYMAN.
-.TP
-.BI "Option \*qEXAPixmaps\*q \*q" boolean \*q
-Under KMS, to avoid thrashing pixmaps in/out of VRAM on low memory cards,
-we use a heuristic based on VRAM amount to determine whether to allow EXA
-to use VRAM for non-essential pixmaps.  This option allows us to override the
-heuristic.  The default is
-.B on
-with > 32MB VRAM, off with < 32MB.
-.TP
-.BI "Option \*qSwapbuffersWait\*q \*q" boolean \*q
-This option controls the behavior of glXSwapBuffers and glXCopySubBufferMESA
-calls by GL applications.  If enabled, the calls will avoid tearing by making
-sure the display scanline is outside of the area to be copied before the copy
-occurs.  If disabled, no scanline synchronization is performed, meaning tearing
-will likely occur.  Note that when enabled, this option can adversely affect
-the framerate of applications that render frames at less than refresh rate.
-.IP
-The default value is
-.B on.
-.TP
-.BI "Option \*qEnablePageFlip\*q \*q" boolean \*q
-Enable DRI2 page flipping.  The default is
-.B on.
-Pageflipping is supported on all radeon hardware.
-.PP
-The following driver
-.B Options
-are supported for
-.B UMS
-(Userspace Modesetting):
-.TP
 .BI "Option \*qDac6Bit\*q \*q" boolean \*q
 Enables or disables the use of 6 bits per color component when in 8 bpp
 mode (emulates VGA mode).  By default, all 8 bits per color component
@@ -313,14 +213,13 @@ The default value is
 .B 0x1E.
 .TP
 .BI "Option \*qScalerWidth\*q \*q" integer \*q
-This sets the overlay scaler buffer width. Accepted values range from
-1024 to 2048, divisible by 64.  Values other than 1536 and 1920 may
-not make sense.  This should be set automatically, but no one knows
-what the limit is for which chip. If you think quality is not optimal
-when playing back HD video (with horizontal resolution larger than
-this setting), increase this value.  If you get an empty area at the
-right (usually pink), decrease it. Note that this only affects the "true"
-overlay via Xv, and won't affect things like textured video.
+This sets the overlay scaler buffer width. Accepted values range from 1024 to
+2048, divisible by 64, values other than 1536 and 1920 may not make sense
+though. Should be set automatically, but noone has a clue what the limit is
+for which chip. If you think quality is not optimal when playing back HD video
+(with horizontal resolution larger than this setting), increase this value, if
+you get an empty area at the right (usually pink), decrease it. Note this only
+affects the "true" overlay via xv, it won't affect things like textured video.
 .br
 The default value is either 1536 (for most chips) or 1920.
 .TP
@@ -352,7 +251,7 @@ The default is
 .BI "Option \*qBusType\*q \*q" string \*q
 Used to replace previous ForcePCIMode option.
 Should only be used when driver's bus detection is incorrect
-or you want to force an AGP card to PCI mode. You should NEVER force
+or you want to force a AGP card to PCI mode. Should NEVER force
 a PCI card to AGP bus.
 .br
 PCI    \-\- PCI bus
@@ -384,12 +283,12 @@ The default value is
 .B AUTO.
 .TP
 .BI "Option \*qColorTiling\*q \*q" "boolean" \*q
-The framebuffer can be addressed either in linear or tiled mode. Tiled mode can provide
-significant performance benefits with 3D applications.  For 2D it shouldn't matter
+Frame buffer can be addressed either in linear or tiled mode. Tiled mode can provide
+significant performance benefits with 3D applications, for 2D it shouldn't matter
 much. Tiling will be disabled if the virtual x resolution exceeds 2048 (3968 for R300 
-and above), or if DRI is enabled and the drm module is too old.
+and above), or if DRI is enabled the drm module is too old.
 .br
-If this option is enabled, a new DRI driver is required for direct rendering.
+If this option is enabled, a new dri driver is required for direct rendering too.
 .br
 Color tiling will be automatically disabled in interlaced or doublescan screen modes.
 .br
@@ -397,43 +296,12 @@ The default value is
 .B on.
 .TP 
 .BI "Option \*qIgnoreEDID\*q \*q" boolean \*q
-Do not use EDID data for mode validation.  DDC is still used
+Do not use EDID data for mode validation, but DDC is still used
 for monitor detection. This is different from NoDDC option.
 .br
 The default value is
 .B off.
 .TP 
-.BI "Option \*qCustomEDID\*q \*q" string \*q
-Forces the X driver to use the EDID data specified in a file rather
-than the display's EDID. Also overrides DDC monitor detection.
-.br
-You may specify a semicolon-separated list of output name and filename pairs
-with an optional flag, "digital" or "analog", to override the digital bit in
-the EDID which is used by the driver to determine whether to use the
-analog or digital encoder associated with a DVI-I port.
-The output name is the RandR output name, e.g., "VGA-0" or "DVI-0";
-consult the Xorg log for the supported output names of any given system.
-.br
-The file must contain a raw 128-byte EDID block, as captured by
-.B
-get-edid.
-.br
-For example:
-.B
-Option \*qCustomEDID\*q \*qVGA-0:/tmp/edid1.bin; DVI-0:/tmp/edid2.bin:digital\*q
-will assign the EDID from the file /tmp/edid1.bin to the output device
-VGA-0, and the EDID from the file /tmp/edid2.bin to the output device
-DVI-0 and force the DVI port to use the digital encoder.
-.br
-Note that an output name must always be specified,
-even if only one EDID is specified.
-.br
-.B
-Caution:
-Specifying an EDID that doesn't exactly match your display may
-damage your hardware, as it allows the driver to specify timings beyond
-the capabilities of your display. Use with care.
-.TP 
 .BI "Option \*qPanelSize\*q \*q" "string" \*q
 Should only be used when driver cannot detect the correct panel size.
 Apply to both desktop (TMDS) and laptop (LVDS) digital panels.
@@ -467,7 +335,7 @@ parameter may be specified as a float value with standard suffixes like
 .BI "Option \*qRenderAccel\*q \*q" boolean \*q
 Enables or disables hardware Render acceleration.  It is supported on all
 Radeon cards when using EXA acceleration and on Radeon R/RV/RS1xx,
-R/RV/RS2xx and RS3xx when using XAA.  The default is to
+R/RV/RS2xx and RS3xx when usig XAA.  The default is to
 .B enable
 Render acceleration.
 .TP
@@ -478,8 +346,9 @@ and
 .B EXA.
 XAA is the traditional acceleration architecture and support for it is very
 stable.  EXA is a newer acceleration architecture with better performance for
-the Render and Composite extensions.  The default is
-.B EXA.
+the Render and Composite extensions, but the rendering code for it is newer and
+possibly unstable.  The default is
+.B XAA.
 .TP
 .BI "Option \*qAccelDFS\*q \*q" boolean \*q
 Use or don't use accelerated EXA DownloadFromScreen hook when possible (only
@@ -544,22 +413,13 @@ for CRT,
 .B RGB 
 for digital panels
 .TP
-.BI "Option \*qClockGating\*q \*q" boolean \*q
-Enable dynamic clock gating.  This can help reduce heat and increase battery
+.BI "Option \*qDynamicClocks\*q \*q" boolean \*q
+Enable dynamic clock scaling.  The on-chip clocks will scale dynamically
+based on usage. This can help reduce heat and increase battery
 life by reducing power usage.  Some users report reduced 3D performance
 with this enabled.  The default is
 .B off.
 .TP
-.BI "Option \*qForceLowPowerMode\*q \*q" boolean \*q
-Enable a static low power mode.  This can help reduce heat and increase battery
-life by reducing power usage at the expense of performance. The default is
-.B off.
-.TP
-.BI "Option \*qDynamicPM\*q \*q" boolean \*q
-Enable dynamic power mode switching.  This can help reduce heat and increase battery
-life by reducing power usage when the system is idle (DPMS active). The default is
-.B off.
-.TP
 .BI "Option \*qVGAAccess\*q \*q" boolean \*q
 Tell the driver if it can do legacy VGA IOs to the card. This is
 necessary for properly resuming consoles when in VGA text mode, but
@@ -572,16 +432,16 @@ on PowerPC and SPARC and
 on other architectures.
 .TP
 .BI "Option \*qReverseDDC\*q \*q" boolean \*q
-When BIOS connector information isn't available, use this option to
-reverse the mapping of the two main DDC ports. Use this if the X server
+When BIOS connector informations aren't available, use this option to
+reverse the mapping of the 2 main DDC ports. Use this if the X server
 obviously detects the wrong display for each connector. This is
 typically needed on the Radeon 9600 cards bundled with Apple G5s. The
 default is
 .B off.
 .TP
 .BI "Option \*qLVDSProbePLL\*q \*q" boolean \*q
-When BIOS panel information isn't available (like on PowerBooks), it
-may still be necessary to use the firmware-provided PLL values for the
+When BIOS panel informations aren't available (like on PowerBooks), it
+may still be necessary to use the firmware provided PLL values for the
 panel or flickering will happen. This option will force probing of
 the current value programmed in the chip when X is launched in that
 case.  This is only useful for LVDS panels (laptop internal panels).
@@ -597,7 +457,7 @@ The default is
 .TP
 .BI "Option \*qDefaultTMDSPLL\*q \*q" boolean \*q
 Use the default driver provided TMDS PLL values rather than the ones
-provided by the BIOS. This option has no effect on Mac cards.  Enable
+provided by the bios. This option has no effect on Mac cards.  Enable
 this option if you are having problems with a DVI monitor using the
 internal TMDS controller.
 The default is
@@ -605,7 +465,7 @@ The default is
 .TP
 .BI "Option \*qDefaultTVDACAdj\*q \*q" boolean \*q
 Use the default driver provided TVDAC Adj values rather than the ones
-provided by the BIOS. This option has no effect on Mac cards.  Enable
+provided by the bios. This option has no effect on Mac cards.  Enable
 this option if you are having problems with a washed out display on
 the secondary DAC.
 The default is
@@ -628,7 +488,7 @@ The default is
 .BI "Option \*qMacModel\*q \*q" string \*q
 .br
 Used to specify Mac models for connector tables and quirks.  If you have
-a PowerBook or Mini with DVI that does not work properly, try the alternate
+a powerbook or mini with DVI that does not work properly, try the alternate
 options as Apple does not seem to provide a good way of knowing whether
 they use internal or external TMDS for DVI.  Only valid on PowerPC.
 On Linux, the driver will attempt to detect the MacModel automatically.
@@ -655,7 +515,7 @@ The default value is
 .BI "Option \*qTVStandard\*q \*q" string \*q
 .br
 Used to specify the default TV standard if you want to use something other than
-the BIOS default. Valid options are:
+the bios default. Valid options are:
 .br
 ntsc
 .br
@@ -684,20 +544,27 @@ The default is
 .B on. 
 .TP
 .BI "Option \*qInt10\*q \*q" boolean \*q
-This option allows you to disable INT10 initialization.  Set this to
+This option allows you to disable int10 initialization.  Set this to
 False if you are experiencing a hang when initializing a secondary card.
 The default is
 .B on.
 .TP 
+.BI "Option \*qEXAVSync\*q \*q" boolean \*q
+This option attempts to avoid tearing by stalling the engine until the display
+controller has passed the destination region.  It reduces tearing at the cost
+of performance and has been know to cause instability on some chips.
+The default is
+.B off.
+.TP 
 .BI "Option \*qATOMTvOut\*q \*q" boolean \*q
 This option enables experimental TV-out support for R/RV5xx, R/RV6xx, and R/RV7xx
-AtomBIOS chips. TV-out is experimental and may not function on these chips as
+atombios chips. TV-out is experimental and may not function on these chips as
 well as hoped for.
 The default is
 .B off.
 .TP 
 .BI "Option \*qR4xxATOM\*q \*q" boolean \*q
-This option enables modesetting on R/RV4xx chips using AtomBIOS.
+This option enables modesetting on R/RV4xx chips using atombios.
 The default is
 .B off.
 
@@ -713,28 +580,14 @@ It has two values: 'off'(0) and 'on'(1). The default is
 .B 'on'(1).
 
 .TP
-.BI "XV_CRTC"
-XV_CRTC is used to control which display controller (crtc) the textured
-adapter synchronizes the screen update with when XV_VSYNC is enabled.
-The default, 'auto'(-1), will sync to the display controller that more
-of the video is on; when this is ambiguous, the display controller associated
-with the RandR primary output is preferred.  This attribute is useful for
-things like clone mode where the user can best decide which display should be
-synced.
-The default is
-.B 'auto'(-1).
-
-.TP
 .BI "XV_BICUBIC"
 XV_BICUBIC is used to control whether textured adapter should apply
 a bicubic filter to smooth the output. It has three values: 'off'(0), 'on'(1)
 and 'auto'(2). 'off' means never apply the filter, 'on' means always apply
 the filter and 'auto' means apply the filter only if the X and Y
-sizes are scaled to more than double to avoid blurred output.  Bicubic
-filtering is not currently compatible with other Xv attributes like hue,
-contrast, and brightness, and must be disabled to use those attributes.
+sizes are scaled to more than double, this to avoid blurred output.
 The default is
-.B 'off'(0).
+.B 'auto'(2).
 
 .SH SEE ALSO
 __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
@@ -777,7 +630,7 @@ Kevin E. Martin          \fIkem@freedesktop.org\fP
 Alan Hourihane           \fIalanh@fairlite.demon.co.uk\fP
 Marc Aurele La France    \fItsi@xfree86.org\fP
 Benjamin Herrenschmidt   \fIbenh@kernel.crashing.org\fP
-Michel D\(:anzer            \fImichel@daenzer.net\fP
+Michel D\(:anzer            \fImichel@tungstengraphics.com\fP
 Alex Deucher             \fIalexdeucher@gmail.com\fP
 Bogdan D.                \fIbogdand@users.sourceforge.net\fP
 Eric Anholt              \fIeric@anholt.net\fP