summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-04-16 11:58:19 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-05-08 12:25:48 -0400
commitfaa782c7a56de99900c9b3f54714f010ce73dcf3 (patch)
tree3cb6ed17b60d4fbd07473b5732a44324151e3e9a
parentf2c0fa5e3d96f1bcc916e1a36268bdc7acd4cda7 (diff)
RS690/RS740: fix connector enumeration in some cases
Should fix Masta-G's issue reported on IRC.
-rw-r--r--src/radeon_atombios.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index b2332bbd..1dde10d5 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -2255,10 +2255,11 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
else if ((info->ChipFamily == CHIP_FAMILY_RS690) ||
(info->ChipFamily == CHIP_FAMILY_RS740)) {
/* IGP DFP ports use non-standard gpio entries */
- if ((i == ATOM_DEVICE_DFP2_INDEX) || (i == ATOM_DEVICE_DFP3_INDEX))
+ if ((i == ATOM_DEVICE_DFP2_INDEX) || (i == ATOM_DEVICE_DFP3_INDEX)) {
info->BiosConnector[i].ddc_i2c =
RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1);
- else
+ info->BiosConnector[i].output_id = ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1;
+ } else
info->BiosConnector[i].ddc_i2c =
RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
} else