summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-01-05 09:11:55 +1000
committerDave Airlie <airlied@linux.ie>2008-01-05 09:11:55 +1000
commit308848783ed9ae27aed7c7de6ee813d375ef495e (patch)
treefa9f8bfd43cc4f7acdfd2b465479e5a4d82168c2 /src
parent94d5a432f72801f821d1c4ce952baba17552659d (diff)
i2c: a line mux of 0 is valid
Diffstat (limited to 'src')
-rw-r--r--src/radeon_atombios.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 73a185b4..8b31a33c 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1717,17 +1717,14 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
info->BiosConnector[i].ConnectorType = ci.sucConnectorInfo.sbfAccess.bfConnectorType;
info->BiosConnector[i].DACType = ci.sucConnectorInfo.sbfAccess.bfAssociatedDAC - 1;
- if (ci.sucI2cId.sbfAccess.bfI2C_LineMux) {
- /* don't assign a gpio for tv */
- if ((i == ATOM_DEVICE_TV1_INDEX) ||
- (i == ATOM_DEVICE_TV2_INDEX) ||
- (i == ATOM_DEVICE_CV_INDEX))
- info->BiosConnector[i].ddc_line = 0;
- else
- info->BiosConnector[i].ddc_line =
- RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
- } else {
- info->BiosConnector[i].ddc_line = 0;
+ /* don't assign a gpio for tv */
+ if ((i == ATOM_DEVICE_TV1_INDEX) ||
+ (i == ATOM_DEVICE_TV2_INDEX) ||
+ (i == ATOM_DEVICE_CV_INDEX))
+ info->BiosConnector[i].ddc_line = 0;
+ else
+ info->BiosConnector[i].ddc_line =
+ RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
}
if (i == ATOM_DEVICE_DFP1_INDEX)