summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-01-04 17:16:54 +1000
committerDave Airlie <airlied@linux.ie>2008-01-04 17:16:54 +1000
commit94d5a432f72801f821d1c4ce952baba17552659d (patch)
treed830debb31ed9445b9548ff8a668fbdecbaa7751 /src
parent2e4473b63d65801ae8ac5a8391de232b2201d958 (diff)
atombios: i2c lines are all done with sw so we can accept any of them.
hch reported this working on his laptop with 0x7e60 as EDID for LVDS
Diffstat (limited to 'src')
-rw-r--r--src/radeon_atombios.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 7cf05567..73a185b4 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1717,7 +1717,7 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
info->BiosConnector[i].ConnectorType = ci.sucConnectorInfo.sbfAccess.bfConnectorType;
info->BiosConnector[i].DACType = ci.sucConnectorInfo.sbfAccess.bfAssociatedDAC - 1;
- if (ci.sucI2cId.sbfAccess.bfHW_Capable) {
+ if (ci.sucI2cId.sbfAccess.bfI2C_LineMux) {
/* don't assign a gpio for tv */
if ((i == ATOM_DEVICE_TV1_INDEX) ||
(i == ATOM_DEVICE_TV2_INDEX) ||
@@ -1726,11 +1726,6 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
else
info->BiosConnector[i].ddc_line =
RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
- } else if (ci.sucI2cId.sbfAccess.bfI2C_LineMux) {
- /* add support for GPIO line */
- ErrorF("Unsupported SW GPIO - device %d: gpio line: 0x%x\n",
- i, (unsigned int)RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux));
- info->BiosConnector[i].ddc_line = 0;
} else {
info->BiosConnector[i].ddc_line = 0;
}