xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit a5c55c418319c1315ad73c305ef48b44fe1d9580
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Sat Oct 27 19:46:11 2007 -0400

    RADEON: disable FP DETECT for DVI.
    
    These bits don't seem to be reliable or routed right
    in all cases.

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 9cfc2c4..e9a709f 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -686,7 +686,7 @@ static RADEONMonitorType RADEONPortCheckNonDDC(ScrnInfoPtr pScrn, xf86OutputPtr
 	} else
 #endif
 	    MonType = MT_LCD;
-    } else if (radeon_output->type == OUTPUT_DVI) {
+    } /*else if (radeon_output->type == OUTPUT_DVI) {
 	if (radeon_output->TMDSType == TMDS_INT) {
 	    if (INREG(RADEON_FP_GEN_CNTL) & RADEON_FP_DETECT_SENSE)
 		MonType = MT_DFP;
@@ -694,7 +694,7 @@ static RADEONMonitorType RADEONPortCheckNonDDC(ScrnInfoPtr pScrn, xf86OutputPtr
 	    if (INREG(RADEON_FP2_GEN_CNTL) & RADEON_FP2_DETECT_SENSE)
 		MonType = MT_DFP;
 	}
-    }
+	}*/
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 	       "Detected Monitor Type: %d\n", MonType);