summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-11-20 18:01:15 -0500
committerAlex Deucher <alex@botch2.(none)>2007-11-20 18:01:15 -0500
commit3e47683ffaa44a89cda9bcddf530643befb27efa (patch)
tree61b30a9e1c19661ed5dfcb921db95cf580b5d00a
parent7412952eb1d1e9857cdab8417f7305f676900827 (diff)
RADEON: fixup for bios tables with wrong connector types
-rw-r--r--src/radeon_bios.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index f7fb4197..ac2495fa 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -246,6 +246,17 @@ static Bool RADEONGetATOMConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
else
info->BiosConnector[i].TMDSType = TMDS_UNKNOWN;
+ /* Always set the connector type to VGA for CRT1/CRT2. if they are
+ * shared with a DVI port, we'll pick up the DVI connector below when we
+ * merge the outputs
+ */
+ if ((i == ATOM_DEVICE_CRT1_INDEX || i == ATOM_DEVICE_CRT2_INDEX) &&
+ (info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_I ||
+ info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_D ||
+ info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_A)) {
+ info->BiosConnector[i].ConnectorType = CONNECTOR_VGA;
+ }
+
} else {
info->BiosConnector[i].valid = FALSE;
}