From 9fd6c994cb4ac444bd7ab2623961086d4aafc5ac Mon Sep 17 00:00:00 2001 From: Connor Behan Date: Thu, 23 Jul 2015 17:07:41 -0400 Subject: [PATCH r128] Assume CRT in the absence of other monitors So far we have been assuming that DFP-capable chipsets are DVI unless VGA ports are listed in their connector tables. However, a RAGE128TF card proves that this need not be the case. Since there appears to be no way to tell what connector is present ahead of time, it seems best to just assume MT_CRT (like the old driver) when no MT_DFP can be detected. This means that the card will still consume power when there really is no monitor, but this seems like a small price to pay. Output can be disabled via xrandr of course. And starting X with no monitor fails anyway for UMS drivers. Signed-off-by: Connor Behan --- src/r128_output.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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; -- 2.4.5