xf86-video-r128: Branch 'master'

[Connor Behan]

 src/r128_output.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 562681414f38c6925da01b3fec0802f532cd9e53
Author: Connor Behan <connor.behan at gmail.com>
Date:   Sun Jan 17 16:45:31 2016 -0500

    Assume CRT in the absence of other monitors
    
    This patch is still untested, but it sounds like a lot of people need
    it. Assuming that there are no monitors when DDC fails (which causes X
    to abort with UMS) does not make sense. Some people will always have DDC
    fail. For example, the pins are not connected on an iMac G3. For another
    example, some RAGE128TF cards are known to lie that there is no VGA port
    in the connector table.
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>

diff --git a/src/r128_output.c b/src/r128_output.c
index 75a70b4..a2c754b 100644
--- a/src/r128_output.c
+++ b/src/r128_output.c
@@ -234,7 +234,7 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output)
     unsigned char *R128MMIO = info->MMIO;
     R128OutputPrivatePtr r128_output = output->driver_private;
 
-    R128MonitorType MonType = MT_NONE;
+    R128MonitorType MonType = MT_CRT;
     xf86MonPtr *MonInfo = &output->MonInfo;
     uint32_t mask1, mask2;
 
@@ -269,9 +269,6 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output)
             else
                 MonType = MT_CRT;
 	}
-    } else if (xf86I2CProbeAddress(r128_output->pI2CBus, 0x0060)) {
-        /* Just in case. */
-        MonType = MT_CRT;
     }
 
     return MonType;