xf86-video-ati: Branch 'randr-1.2'

[Alex Deucher]

 src/radeon_output.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

New commits:
diff-tree e50ca35ce2ea79dadb38ce14e459eed836452ff7 (from abb9b57e7b4162ab6c21fd1e809d24f13f7e1ea1)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Fri May 25 18:56:32 2007 -0400

    RADEON: clean up non-DDC probe, add detect for DVI

diff --git a/src/radeon_output.c b/src/radeon_output.c
index e45690b..e823120 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -189,15 +189,12 @@ static RADEONMonitorType RADEONPortCheck
     RADEONMonitorType MonType = MT_NONE;
 
 
-    if (info->IsMobility) {
-        if ((info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_LVDS_ATOM) ||
-	    (!info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_PROPRIETARY)) {
-	     if (INREG(RADEON_BIOS_4_SCRATCH) & 4)
-	         MonType =  MT_LCD;
-        }
-	/* non-DDC TMDS panel connected through DVO */
-	if (INREG(RADEON_FP2_GEN_CNTL) & RADEON_FP2_ON)
-	  MonType = MT_DFP;
+    if (radeon_output->type == OUTPUT_LVDS) {
+	if (INREG(RADEON_BIOS_4_SCRATCH) & 4)
+	    MonType =  MT_LCD;
+    } else if (radeon_output->type == OUTPUT_DVI) {
+	if (INREG(RADEON_FP_GEN_CNTL) & RADEON_FP_DETECT_SENSE)
+	    MonType = MT_DFP;
     }
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,