xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 man/radeon.man   |    4 +---
 src/radeon_dri.c |   15 ++++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit bcd590103e04bfdb4f12413beacebf344f07e88e
Author: Alex Deucher <alex at botch2.(none)>
Date:   Tue Jan 29 12:12:54 2008 -0500

    RADEON: update man page to reflect AGP 1x default revert

diff --git a/man/radeon.man b/man/radeon.man
index b8f4f93..b4ade32 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -165,9 +165,7 @@ Set AGP data transfer rate.
 others \-\- invalid
 .br
 The default is to
-.B leave it unchanged for AGP v3
-and
-.B 1x otherwise.
+.B leave it unchanged.
 .TP
 .BI "Option \*qAGPFastWrite\*q \*q" boolean \*q
 Enable AGP fast writes.  Enabling this is frequently the cause of
commit 09348a83d06ba9d3129499c4daedd44a68771530
Author: Alex Deucher <alex at botch2.(none)>
Date:   Tue Jan 29 12:09:24 2008 -0500

    Seems the default is more reliable... we can't win.
    
    Revert "radeon: Default to 1x again with non-v3 AGP cards."
    
    This reverts commit b653e5a628bfa4dfb168e96f93f41eb910f409fb.

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index f1003d7..ac8d03c 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -726,9 +726,18 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen)
        pcie-agp rialto bridge chip - use the one from bridge which must match */
     CARD32 agp_status = (INREG(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode;
     Bool is_v3 = (agp_status & RADEON_AGPv3_MODE);
-    unsigned int defaultMode = is_v3 ?
-	((agp_status & RADEON_AGPv3_8X_MODE) ? 8 : 4) : 1;
-    MessageType from = X_DEFAULT;
+    unsigned int defaultMode;
+    MessageType from;
+
+    if (is_v3) {
+	defaultMode = (agp_status & RADEON_AGPv3_8X_MODE) ? 8 : 4;
+    } else {
+	if (agp_status & RADEON_AGP_4X_MODE) defaultMode = 4;
+	else if (agp_status & RADEON_AGP_2X_MODE) defaultMode = 2;
+	else defaultMode = 1;
+    }
+
+    from = X_DEFAULT;
 
     if (xf86GetOptValInteger(info->Options, OPTION_AGP_MODE, &info->agpMode)) {
 	if ((info->agpMode < (is_v3 ? 4 : 1)) ||