summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2007-12-15 00:48:26 +0100
committerMichel Dänzer <michel@tungstengraphics.com>2007-12-15 00:48:26 +0100
commit6229825fa5d6715569098afbb21a40f7a2e7e6be (patch)
tree2bf5683a93240250894387180409691c3e2c32ac
parent818ccf0fd4b5879171c5f20526d5a58638f8fde5 (diff)
radeon: Warning fixes.
The lid detection code probably wouldn't work on other non-x86 platforms though...
-rw-r--r--src/radeon_crtc.c14
-rw-r--r--src/radeon_output.c4
2 files changed, 8 insertions, 10 deletions
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;