xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_output.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 7b01e1ee29f681bf1735ecded6445d12beeb52d8
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Jan 11 12:40:06 2010 -0500

    rv100: reject modes >135 Mhz with DVI
    
    Due to heat issues. fixes bug 25992
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 20f8ada..153cedf 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -545,6 +545,10 @@ radeon_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
 
     /* single link DVI check */
     if (pMode->Clock > 165000 && radeon_output->MonType == MT_DFP) {
+	/* clocks over 135 MHz have heat issues with DVI on RV100 */
+	if ((info->ChipFamily == CHIP_FAMILY_RV100) && (pMode->Clock > 135000))
+	    return MODE_CLOCK_HIGH;
+
 	/* DP->DVI converter */
 	if (radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT)
 	    return MODE_CLOCK_HIGH;