Merge branch 'upstream-experimental' into debian-experimental

Conflicts:

	Makefile.am
	configure.ac
	man/radeon.man
	src/Makefile.am
	src/ati.c
	src/ati.h
	src/atiadjust.c
	src/atiadjust.h
	src/atiaudio.c
	src/atiaudio.h
	src/atibank.c
	src/atibank.h
	src/atibus.c
	src/atibus.h
	src/atichip.c
	src/atichip.h
	src/aticlock.c
	src/aticlock.h
	src/aticonfig.c
	src/aticonfig.h
	src/aticonsole.c
	src/aticonsole.h
	src/aticrtc.h
	src/aticursor.h
	src/atidac.c
	src/atidac.h
	src/atidecoder.c
	src/atidecoder.h
	src/atidga.c
	src/atidga.h
	src/atidri.c
	src/atidri.h
	src/atidripriv.h
	src/atidsp.c
	src/atidsp.h
	src/atii2c.c
	src/atii2c.h
	src/atiident.c
	src/atiident.h
	src/atiload.c
	src/atiload.h
	src/atilock.c
	src/atilock.h
	src/atimach64.c
	src/atimach64.h
	src/atimach64accel.c
	src/atimach64accel.h
	src/atimach64cursor.c
	src/atimach64exa.c
	src/atimach64i2c.c
	src/atimach64i2c.h
	src/atimach64io.c
	src/atimach64io.h
	src/atimach64xv.c
	src/atimisc.c
	src/atimode.c
	src/atimode.h
	src/atimodule.c
	src/atimodule.h
	src/atioption.c
	src/atioption.h
	src/atipciids.h
	src/atipreinit.c
	src/atipreinit.h
	src/atiprint.c
	src/atiprint.h
	src/atipriv.h
	src/atiprobe.c
	src/atiprobe.h
	src/atirgb514.c
	src/atirgb514.h
	src/atiscreen.c
	src/atiscreen.h
	src/atistruct.h
	src/atituner.c
	src/atituner.h
	src/atiutil.c
	src/atiutil.h
	src/ativalid.c
	src/ativalid.h
	src/ativersion.h
	src/ativga.c
	src/ativga.h
	src/ativgaio.c
	src/ativgaio.h
	src/atividmem.c
	src/atividmem.h
	src/atiwonder.c
	src/atiwonder.h
	src/atiwonderio.c
	src/atiwonderio.h
	src/atixv.h
	src/mach64_common.h
	src/mach64_dri.h
	src/mach64_sarea.h
	src/r128.h
	src/r128_accel.c
	src/r128_common.h
	src/r128_cursor.c
	src/r128_dga.c
	src/r128_dri.c
	src/r128_dri.h
	src/r128_dripriv.h
	src/r128_driver.c
	src/r128_misc.c
	src/r128_probe.c
	src/r128_probe.h
	src/r128_reg.h
	src/r128_sarea.h
	src/r128_version.h
	src/r128_video.c
	src/radeon.h
	src/radeon_accel.c
	src/radeon_accelfuncs.c
	src/radeon_bios.c
	src/radeon_common.h
	src/radeon_commonfuncs.c
	src/radeon_cursor.c
	src/radeon_dga.c
	src/radeon_dri.c
	src/radeon_dri.h
	src/radeon_dripriv.h
	src/radeon_driver.c
	src/radeon_exa.c
	src/radeon_exa_funcs.c
	src/radeon_exa_render.c
	src/radeon_macros.h
	src/radeon_mergedfb.c
	src/radeon_mergedfb.h
	src/radeon_misc.c
	src/radeon_mm_i2c.c
	src/radeon_probe.c
	src/radeon_probe.h
	src/radeon_reg.h
	src/radeon_render.c
	src/radeon_sarea.h
	src/radeon_version.h
	src/radeon_video.c
	src/radeon_video.h
	src/theatre200.c
	src/theatre200.h
	src/theatre_detect.c
	src/theatre_detect.h

1 files changed, 44 insertions, 24 deletions

diff --git a/man/radeon.man b/man/radeon.man
index 9dc75fc..db090d5 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -15,9 +15,8 @@ radeon \- ATI RADEON video driver
 .B radeon
 is an __xservername__ driver for ATI RADEON based video cards.  It contains
 full support for 8, 15, 16 and 24 bit pixel depths, dual-head setup,
-flat panel, hardware 2D acceleration, hardware 3D acceleration
-(experimental on R300 and R400 series cards), hardware cursor, XV extension,
-and the Xinerama extension.
+flat panel, hardware 2D acceleration, hardware 3D acceleration, hardware cursor, 
+XV extension, and the Xinerama extension.
 .SH SUPPORTED HARDWARE
 The
 .B radeon
@@ -27,7 +26,7 @@ driver supports PCI and AGP video cards based on the following ATI chips
 Radeon 7200
 .TP 12
 .B RV100
-Radeon 7000(VE), M6
+Radeon 7000(VE), M6, RN50/ES1000
 .TP 12
 .B RS100
 Radeon IGP320(M)
@@ -54,43 +53,43 @@ Radeon 9100 IGP
 Radeon 9200 IGP
 .TP 12
 .B RS400
-Radeon XPRESS 200/200M IGP
+Radeon XPRESS 200/200M IGP (2d only)
 .TP 12
 .B RV280
 Radeon 9200PRO/9200/9200SE, M9+
 .TP 12
 .B R300
-Radeon 9700PRO/9700/9500PRO/9500/9600TX, FireGL X1/Z1 (2D only)
+Radeon 9700PRO/9700/9500PRO/9500/9600TX, FireGL X1/Z1
 .TP 12
 .B R350
-Radeon 9800PRO/9800SE/9800, FireGL X2 (2D only)
+Radeon 9800PRO/9800SE/9800, FireGL X2
 .TP 12
 .B R360
-Radeon 9800XT (2d only)
+Radeon 9800XT
 .TP 12
 .B RV350
-Radeon 9600PRO/9600SE/9600, M10/M11, FireGL T2 (2D only)
+Radeon 9600PRO/9600SE/9600, M10/M11, FireGL T2
 .TP 12
 .B RV360 
-Radeon 9600XT (2d only)
+Radeon 9600XT
 .TP 12
 .B RV370
-Radeon X300, M22 (2d only)
+Radeon X300, M22
 .TP 12
 .B RV380
-Radeon X600, M24 (2d only)
+Radeon X600, M24
 .TP 12
 .B RV410
-Radeon X700, M26 PCIE (2d only)
+Radeon X700, M26 PCIE
 .TP 12
 .B R420
-Radeon X800 AGP (2d only)
+Radeon X800 AGP
 .TP 12
 .B R423/R430
-Radeon X800, M28 PCIE (2d only)
+Radeon X800, M28 PCIE
 .TP 12
 .B R480/R481
-Radeon X850 PCIE/AGP (2d only)
+Radeon X850 PCIE/AGP
 
 .SH CONFIGURATION DETAILS
 Please refer to __xconfigfile__(__filemansuffix__) for general configuration
@@ -140,6 +139,17 @@ This overrides the default pixel value for the YUV video overlay key.
 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
+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
 .BI "Option \*qUseFBDev\*q \*q" boolean \*q
 Enable or disable use of an OS\-specific framebuffer device interface
 (which is not supported on all OSs).  MergedFB does not work when this
@@ -152,22 +162,26 @@ The default is
 Set AGP data transfer rate.
 (used only when DRI is enabled)
 .br
-1      \-\- x1 (default)
+1      \-\- 1x (before AGPv3 only)
 .br
-2      \-\- x2
+2      \-\- 2x (before AGPv3 only)
 .br
-4      \-\- x4
+4      \-\- 4x
 .br
-8      \-\- x8
+8      \-\- 8x (AGPv3 only)
 .br
 others \-\- invalid
+.br
+The default is to
+.B leave it unchanged.
 .TP
 .BI "Option \*qAGPFastWrite\*q \*q" boolean \*q
-Enable AGP fast write.  Enabling this option is frequently the cause of
-instability. Used only when the DRI is enabled.
+Enable AGP fast writes.  Enabling this is frequently the cause of
+instability. Used only when the DRI is enabled. If you enable
+this option you will get *NO* support from developers.
 .br
-The default is
-.B off.
+The default is to
+.B leave it unchanged.
 .TP
 .BI "Option \*qBusType\*q \*q" string \*q
 Used to replace previous ForcePCIMode option.
@@ -611,6 +625,12 @@ case.  This is only useful for LVDS panels (laptop internal panels).
 The default is
 .B on.
 .TP
+.BI "Option \*qRN50Force3D\*q \*q" boolean \*q
+Enable DRI support for RN50/ES1000 chips.  The 3D engine on these chips has
+not been validated at the hardware level and is not likely to work in most 
+cases. If it does, you got lucky.  The default is
+.B off.
+.TP
 
 .SH SEE ALSO
 __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)