xf86-video-intel: Branch '2.9' - src/i830_sdvo.c

[Carl Worth]

 src/i830_sdvo.c |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 8e4fc7d3ba0baa6b680c685429060cb62a08f89f
Author: Carl Worth <cworth at cworth.org>
Date:   Mon Oct 26 04:40:51 2009 -0700

    Revert "Check whether the DVI-I/D is connected or disconnected based on EDID"
    
    This reverts commit 02fe9be695f7e209944bd0f7b67950f93619feee  as it
    was causing regressions detecting DVI monitors for several people.
    
    See:
    
    	http://bugs.freedesktop.org/show_bug.cgi?id=24458
    	http://bugs.freedesktop.org/show_bug.cgi?id=24458
    	http://bugs.freedesktop.org/show_bug.cgi?id=24458)

diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 5ffe0e8..8f3193b 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1824,9 +1824,6 @@ i830_sdvo_detect(xf86OutputPtr output)
 	xf86MonPtr edid_mon;
 	/* Check EDID in DVI-I case */
 	edid_mon = xf86OutputGetEDID (output, intel_output->pDDCBus);
-	/* when there is no EDID, it should be detected as disconnected */
-	if (!edid_mon)
-	    return XF86OutputStatusDisconnected;
 	if (edid_mon && !DIGITAL(edid_mon->features.input_type)) {
 	    xfree(edid_mon);
 	    return XF86OutputStatusDisconnected;