xf86-video-ati: Branch 'master' - 4 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Mon Dec 15 08:31:17 PST 2008
man/radeon.man | 99 +++++++++++++++++++++++++++++------------------
src/pcidb/ati_pciids.csv | 14 +++---
src/radeon.h | 1
src/radeon_chipset_gen.h | 14 +++---
src/radeon_driver.c | 5 --
5 files changed, 78 insertions(+), 55 deletions(-)
New commits:
commit 62344e460f5d0cac81f94c535cda77d3d76528a9
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Mon Dec 15 11:30:42 2008 -0500
Remove remnants of unused DDCMode option
diff --git a/man/radeon.man b/man/radeon.man
index 7edda46..f8526df 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -254,12 +254,6 @@ PCIE \-\- PCI Express (falls back to PCI at present)
.br
The default is
.B auto detect.
-.TP
-.BI "Option \*qDDCMode\*q \*q" boolean \*q
-Force to use the modes queried from the connected monitor.
-.br
-The default is
-.B off.
.TP
.BI "Option \*qDisplayPriority\*q \*q" string \*q
.br
diff --git a/src/radeon.h b/src/radeon.h
index a64782e..8dc8f23 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -165,7 +165,6 @@ typedef enum {
OPTION_ACCEL_DFS,
#endif
#endif
- OPTION_DDC_MODE,
OPTION_IGNORE_EDID,
OPTION_DISP_PRIORITY,
OPTION_PANEL_SIZE,
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index d4ac58e..d414854 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -152,7 +152,6 @@ static const OptionInfoRec RADEONOptions[] = {
{ OPTION_ACCEL_DFS, "AccelDFS", OPTV_BOOLEAN, {0}, FALSE },
#endif
#endif
- { OPTION_DDC_MODE, "DDCMode", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_IGNORE_EDID, "IgnoreEDID", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_DISP_PRIORITY, "DisplayPriority", OPTV_ANYSTR, {0}, FALSE },
{ OPTION_PANEL_SIZE, "PanelSize", OPTV_ANYSTR, {0}, FALSE },
commit f1efee6a11dc9436276fb12cfb90aa79ada1192b
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Mon Dec 15 11:27:17 2008 -0500
Remove mention of MergedFB from server log
noticed by Fabio, bug 19098
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 843e9ff..d4ac58e 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2134,9 +2134,9 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
if (xf86IsEntityShared(info->pEnt->index)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Direct Rendering Disabled -- "
- "Dual-head configuration is not working with "
+ "Zaphod Dual-head configuration is not working with "
"DRI at present.\n"
- "Please use the radeon MergedFB option if you "
+ "Please use the xrandr 1.2 if you "
"want Dual-head with DRI.\n");
return FALSE;
}
commit 94bffac6968057cdedc792f8540fe44cb6ecfd7c
Author: Fabio <fabio.ped at libero.it>
Date: Mon Dec 15 11:22:56 2008 -0500
man page updates
from bug 19098 with some minor fixes from me
diff --git a/man/radeon.man b/man/radeon.man
index 667d33e..7edda46 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -13,14 +13,44 @@ radeon \- ATI RADEON video driver
.fi
.SH DESCRIPTION
.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, hardware cursor,
-XV extension, and the Xinerama extension.
+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;
+.TP
+\(bu
+RandR 1.2 and RandR 1.3 support;
+.TP
+\(bu
+TV Out support (only on R/RV/RS1xx, R/RV/RS2xx, R/RV/RS3xx);
+.TP
+\(bu
+Full EXA 2D acceleration (not supported on R/RV6xx and R/RV/RS7xx);
+.TP
+\(bu
+Full XAA 2D acceleration (not supported on R/RV6xx and R/RV/RS7xx. XAA Render
+acceleration supported only on R/RV100, R/RV/RS2xx and RS300);
+.TP
+\(bu
+Textured XVideo acceleration (not supported on R/RV6xx and R/RV/RS7xx.
+Bicubic filtering only available on R/RV3xx, R/RV/RS4xx, R/RV5xx, and RS690);
+.TP
+\(bu
+Overlay XVideo acceleration (only on R/RV/RS1xx, R/RV/RS2xx,
+R/RV/RS3xx, R/RV/RS4xx);
+.TP
+\(bu
+3D acceleration (not supported on R/RV6xx and R/RV/RS7xx);
+.PD
.SH SUPPORTED HARDWARE
The
.B radeon
-driver supports PCI and AGP video cards based on the following ATI chips
+driver supports PCI, AGP, and PCIE video cards based on the following ATI chips:
+.PP
+.PD 0
.TP 12
.B R100
Radeon 7200
@@ -103,8 +133,8 @@ Radeon X1600/X1650/X1700
.B RV570/R580
Radeon X1900/X1950
.TP 12
-.B RS600/RS690
-Radeon X1200
+.B RS600/RS690/RS740
+Radeon X1200, X2100
.TP 12
.B R600
Radeon HD 2900
@@ -119,8 +149,11 @@ Radeon HD 3850/3870
Radeon HD 3450/3470
.TP 12
.B RS780
-Radeon HD 3200
-
+Radeon HD 3100/3200/3300
+.TP 12
+.B RV770
+Radeon HD 4850/4870
+.PD
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
@@ -249,9 +282,7 @@ The default value is
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), if option
-.B UseFBDev
-is used, or (if DRI is enabled) 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 too.
.br
@@ -271,7 +302,7 @@ The default value is
Should only be used when driver cannot detect the correct panel size.
Apply to both desktop (TMDS) and laptop (LVDS) digital panels.
When a valid panel size is specified, the timings collected from
-DDC and BIOS will not be used. If you have a panel with timings
+DDC and BIOS will not be used. If you have a panel with timings
different from that of a standard VESA mode, you have to provide
this information through the Modeline.
.br
@@ -283,8 +314,8 @@ The default value is
.BI "Option \*qEnablePageFlip\*q \*q" boolean \*q
Enable page flipping for 3D acceleration. This will increase performance
but not work correctly in some rare cases, hence the default is
-.B off.
-It is currently only supported on r4xx and older hardware.
+.B off.
+It is currently only supported on R/RV/RS4xx and older hardware.
.TP
.BI "Option \*qForceMinDotClock\*q \*q" frequency \*q
Override minimum dot clock. Some Radeon BIOSes report a minimum dot
@@ -298,9 +329,9 @@ parameter may be specified as a float value with standard suffixes like
"k", "kHz", "M", "MHz".
.TP
.BI "Option \*qRenderAccel\*q \*q" boolean \*q
-Enables or disables hardware Render acceleration. It is supported on
-Radeon series up to and including r5xx for EXA and up to and
-including r2xx for XAA. The default is to
+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 RS300 when usig XAA. The default is to
.B enable
Render acceleration.
.TP
@@ -369,7 +400,7 @@ This option is intended to be used in following cases:
.br
3. Adjust to one display type in dual-head clone mode setup.
.br
-4. Get better performance with Render acceleration on
+4. Get better performance with Render acceleration on
digital panels (use NONE setting).
.br
The default is
@@ -379,8 +410,8 @@ for CRT,
for digital panels
.TP
.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
+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.
@@ -398,7 +429,7 @@ on other architectures.
.TP
.BI "Option \*qReverseDDC\*q \*q" boolean \*q
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 serve
+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
@@ -414,30 +445,30 @@ The default is
.B on.
.TP
.BI "Option \*qTVDACLoadDetect\*q \*q" boolean \*q
-Enable load detection on the TV DAC. The TV DAC is used to drive both
-TV-OUT and analog monitors. Load detection is often unreliable in the
+Enable load detection on the TV DAC. The TV DAC is used to drive both
+TV-OUT and analog monitors. Load detection is often unreliable in the
TV DAC so it is disabled by default.
The default is
.B off.
.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
-this option if you are having problems with a DVI monitor using the
+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
.B off.
.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
-this option if you are having problems with a washed out display on
+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
.B off.
.TP
.BI "Option \*qDRI\*q \*q" boolean \*q
-Enable DRI support. This option allows you to enable to disable the DRI.
+Enable DRI support. This option allows you to enable to disable the DRI.
The default is
.B off
for RN50/ES1000 and
@@ -446,7 +477,7 @@ for others.
.TP
.BI "Option \*qDefaultConnectorTable\*q \*q" boolean \*q
Enable this option to skip the BIOS connector table parsing and use the
-driver defaults for each chip.
+driver defaults for each chip.
The default is
.B off
.TP
@@ -514,7 +545,7 @@ 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.
commit c7899905ec824071f9cabbd1e271c4d76010b733
Author: Fabio <fabio.ped at libero.it>
Date: Mon Dec 15 10:58:23 2008 -0500
Remove duplicate ATI in some device names
from bug 19098
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 9366600..a0478a4 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -308,7 +308,7 @@
"0x7288","RV570_7288","RV570",,,,,,"ATI Radeon X1950 GT"
"0x7289","RV570_7289","RV570",,,,,,"ATI RV570"
"0x728B","RV570_728B","RV570",,,,,,"ATI RV570"
-"0x728C","RV570_728C","RV570",,,,,,"ATI ATI FireGL V7400"
+"0x728C","RV570_728C","RV570",,,,,,"ATI FireGL V7400"
"0x7290","RV560_7290","RV560",,,,,,"ATI RV560"
"0x7291","RV560_7291","RV560",,,,,,"ATI Radeon X1650"
"0x7293","RV560_7293","RV560",,,,,,"ATI Radeon X1650"
@@ -341,7 +341,7 @@
"0x94C4","RV610_94C4","RV610",,,,,,"ATI Radeon HD 2400 PRO AGP"
"0x94C5","RV610_94C5","RV610",,,,,,"ATI FireGL V4000"
"0x94C6","RV610_94C6","RV610",,,,,,"ATI RV610"
-"0x94C7","RV610_94C7","RV610",,,,,,"ATI ATI Radeon HD 2350"
+"0x94C7","RV610_94C7","RV610",,,,,,"ATI Radeon HD 2350"
"0x94C8","RV610_94C8","RV610",1,,,,,"ATI Mobility Radeon HD 2400 XT"
"0x94C9","RV610_94C9","RV610",1,,,,,"ATI Mobility Radeon HD 2400"
"0x94CB","RV610_94CB","RV610",1,,,,,"ATI RADEON E2400"
@@ -373,11 +373,11 @@
"0x95CD","RV620_95CD","RV620",,,,,,"ATI FireMV 2450"
"0x95CE","RV620_95CE","RV620",,,,,,"ATI FireMV 2260"
"0x95CF","RV620_95CF","RV620",,,,,,"ATI FireMV 2260"
-"0x9590","RV635_9590","RV635",,,,,,"ATI ATI Radeon HD 3600 Series"
-"0x9596","RV635_9596","RV635",,,,,,"ATI ATI Radeon HD 3650 AGP"
-"0x9597","RV635_9597","RV635",,,,,,"ATI ATI Radeon HD 3600 PRO"
-"0x9598","RV635_9598","RV635",,,,,,"ATI ATI Radeon HD 3600 XT"
-"0x9599","RV635_9599","RV635",,,,,,"ATI ATI Radeon HD 3600 PRO"
+"0x9590","RV635_9590","RV635",,,,,,"ATI Radeon HD 3600 Series"
+"0x9596","RV635_9596","RV635",,,,,,"ATI Radeon HD 3650 AGP"
+"0x9597","RV635_9597","RV635",,,,,,"ATI Radeon HD 3600 PRO"
+"0x9598","RV635_9598","RV635",,,,,,"ATI Radeon HD 3600 XT"
+"0x9599","RV635_9599","RV635",,,,,,"ATI Radeon HD 3600 PRO"
"0x9591","RV635_9591","RV635",1,,,,,"ATI Mobility Radeon HD 3650"
"0x9593","RV635_9593","RV635",1,,,,,"ATI Mobility Radeon HD 3670"
"0x9610","RS780_9610","RS780",,1,,,1,"ATI Radeon HD 3200 Graphics"
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 2a96267..2a3ae48 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -227,7 +227,7 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_RV570_7288, "ATI Radeon X1950 GT" },
{ PCI_CHIP_RV570_7289, "ATI RV570" },
{ PCI_CHIP_RV570_728B, "ATI RV570" },
- { PCI_CHIP_RV570_728C, "ATI ATI FireGL V7400" },
+ { PCI_CHIP_RV570_728C, "ATI FireGL V7400" },
{ PCI_CHIP_RV560_7290, "ATI RV560" },
{ PCI_CHIP_RV560_7291, "ATI Radeon X1650" },
{ PCI_CHIP_RV560_7293, "ATI Radeon X1650" },
@@ -260,7 +260,7 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_RV610_94C4, "ATI Radeon HD 2400 PRO AGP" },
{ PCI_CHIP_RV610_94C5, "ATI FireGL V4000" },
{ PCI_CHIP_RV610_94C6, "ATI RV610" },
- { PCI_CHIP_RV610_94C7, "ATI ATI Radeon HD 2350" },
+ { PCI_CHIP_RV610_94C7, "ATI Radeon HD 2350" },
{ PCI_CHIP_RV610_94C8, "ATI Mobility Radeon HD 2400 XT" },
{ PCI_CHIP_RV610_94C9, "ATI Mobility Radeon HD 2400" },
{ PCI_CHIP_RV610_94CB, "ATI RADEON E2400" },
@@ -292,11 +292,11 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_RV620_95CD, "ATI FireMV 2450" },
{ PCI_CHIP_RV620_95CE, "ATI FireMV 2260" },
{ PCI_CHIP_RV620_95CF, "ATI FireMV 2260" },
- { PCI_CHIP_RV635_9590, "ATI ATI Radeon HD 3600 Series" },
- { PCI_CHIP_RV635_9596, "ATI ATI Radeon HD 3650 AGP" },
- { PCI_CHIP_RV635_9597, "ATI ATI Radeon HD 3600 PRO" },
- { PCI_CHIP_RV635_9598, "ATI ATI Radeon HD 3600 XT" },
- { PCI_CHIP_RV635_9599, "ATI ATI Radeon HD 3600 PRO" },
+ { PCI_CHIP_RV635_9590, "ATI Radeon HD 3600 Series" },
+ { PCI_CHIP_RV635_9596, "ATI Radeon HD 3650 AGP" },
+ { PCI_CHIP_RV635_9597, "ATI Radeon HD 3600 PRO" },
+ { PCI_CHIP_RV635_9598, "ATI Radeon HD 3600 XT" },
+ { PCI_CHIP_RV635_9599, "ATI Radeon HD 3600 PRO" },
{ PCI_CHIP_RV635_9591, "ATI Mobility Radeon HD 3650" },
{ PCI_CHIP_RV635_9593, "ATI Mobility Radeon HD 3670" },
{ PCI_CHIP_RS780_9610, "ATI Radeon HD 3200 Graphics" },
More information about the xorg-commit
mailing list