GitLab will be down for maintenance this Sunday 13th June, from approx 7-11am UTC. This is for a PostgreSQL migration. See the tracker issue for more informations.

Commit 56268141 authored by Connor Behan's avatar Connor Behan
Browse files

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's avatarConnor Behan <connor.behan@gmail.com>
parent d6dd6c9a
...@@ -234,7 +234,7 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output) ...@@ -234,7 +234,7 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output)
unsigned char *R128MMIO = info->MMIO; unsigned char *R128MMIO = info->MMIO;
R128OutputPrivatePtr r128_output = output->driver_private; R128OutputPrivatePtr r128_output = output->driver_private;
R128MonitorType MonType = MT_NONE; R128MonitorType MonType = MT_CRT;
xf86MonPtr *MonInfo = &output->MonInfo; xf86MonPtr *MonInfo = &output->MonInfo;
uint32_t mask1, mask2; uint32_t mask1, mask2;
...@@ -269,9 +269,6 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output) ...@@ -269,9 +269,6 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output)
else else
MonType = MT_CRT; MonType = MT_CRT;
} }
} else if (xf86I2CProbeAddress(r128_output->pI2CBus, 0x0060)) {
/* Just in case. */
MonType = MT_CRT;
} }
return MonType; return MonType;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment