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

[Michel Daenzer]

 src/radeon_crtc.c   |   14 ++++----------
 src/radeon_dri.c    |   15 +++------------
 src/radeon_output.c |    4 ++++
 3 files changed, 11 insertions(+), 22 deletions(-)

New commits:
commit b653e5a628bfa4dfb168e96f93f41eb910f409fb
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sat Dec 15 00:50:10 2007 +0100

    radeon: Default to 1x again with non-v3 AGP cards.
    
    Seems more reliable in general than what was set up by firmware - fingers
    crossed...

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 618334e..3190451 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -726,18 +726,9 @@ 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;
-    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;
+    unsigned int defaultMode = is_v3 ?
+	((agp_status & RADEON_AGPv3_8X_MODE) ? 8 : 4) : 1;
+    MessageType from = X_DEFAULT;
 
     if (xf86GetOptValInteger(info->Options, OPTION_AGP_MODE, &info->agpMode)) {
 	if ((info->agpMode < (is_v3 ? 4 : 1)) ||
commit 6229825fa5d6715569098afbb21a40f7a2e7e6be
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sat Dec 15 00:48:26 2007 +0100

    radeon: Warning fixes.
    
    The lid detection code probably wouldn't work on other non-x86 platforms
    though...

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index a2603a5..ebb8c52 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -606,12 +606,6 @@ RADEONInitCrtc2Registers(xf86CrtcPtr crtc, RADEONSavePtr save,
 }
 
 
-/* Compute n/d with rounding */
-static int RADEONDiv(int n, int d)
-{
-    return (n + (d / 2)) / d;
-}
-
 static CARD32 RADEONDiv64(CARD64 n, CARD32 d)
 {
     return (n + (d / 2)) / d;
@@ -680,10 +674,10 @@ RADEONComputePLL(RADEONPLLPtr pll,
 	}
     }
 
-    ErrorF("best_freq: %d\n", best_freq);
-    ErrorF("best_feedback_div: %d\n", best_feedback_div);
-    ErrorF("best_ref_div: %d\n", best_ref_div);
-    ErrorF("best_post_div: %d\n", best_post_div);
+    ErrorF("best_freq: %u\n", (unsigned)best_freq);
+    ErrorF("best_feedback_div: %u\n", (unsigned)best_feedback_div);
+    ErrorF("best_ref_div: %u\n", (unsigned)best_ref_div);
+    ErrorF("best_post_div: %u\n", (unsigned)best_post_div);
 
     *chosen_dot_clock_freq = best_freq;
     *chosen_feedback_div = best_feedback_div;
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 12c83aa..5dd80fa 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -684,6 +684,8 @@ void RADEONConnectorFindMonitor(ScrnInfoPtr pScrn, xf86OutputPtr output)
     }
 }
 
+#ifndef __powerpc__
+
 static RADEONMonitorType
 RADEONDetectLidStatus(ScrnInfoPtr pScrn)
 {
@@ -723,6 +725,8 @@ RADEONDetectLidStatus(ScrnInfoPtr pScrn)
     return MonType;
 }
 
+#endif /* __powerpc__ */
+
 static RADEONMonitorType RADEONPortCheckNonDDC(ScrnInfoPtr pScrn, xf86OutputPtr output)
 {
     RADEONOutputPrivatePtr radeon_output = output->driver_private;