From 6a363f68415d37c302151581f2a86855dba39b67 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 11 Jan 2010 15:13:45 -0500 Subject: rv100: fix typo in fix for bug 25992 Noticed by Maarten Maathuis. --- src/radeon_output.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/radeon_output.c b/src/radeon_output.c index 153cedf1..a16f7fc5 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -543,12 +543,14 @@ 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)) + /* clocks over 135 MHz have heat issues with DVI on RV100 */ + if ((radeon_output->MonType == MT_DFP) && + (info->ChipFamily == CHIP_FAMILY_RV100) && + (pMode->Clock > 135000)) return MODE_CLOCK_HIGH; + /* single link DVI check */ + if (pMode->Clock > 165000 && radeon_output->MonType == MT_DFP) { /* DP->DVI converter */ if (radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT) return MODE_CLOCK_HIGH; -- cgit v1.2.3