diff options
| author | Alex Deucher <alex@botch2.(none)> | 2008-01-20 18:33:22 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2008-01-20 18:33:22 -0500 |
| commit | b2db8657fb888cff6d64c6dcb182caac389776ce (patch) | |
| tree | 8aae5a5c3e5c66811ae9ac5dda73c45a488e9f70 /src/radeon_bios.c | |
| parent | a43003b24022a833e604f41b2873c0350b34181c (diff) | |
RADEON: re-work i2c for DDC
Unify the radeon/avivo paths and grab the data/clk masks from bios
if available
Diffstat (limited to 'src/radeon_bios.c')
| -rw-r--r-- | src/radeon_bios.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/radeon_bios.c b/src/radeon_bios.c index 829a641e..46f4a3b8 100644 --- a/src/radeon_bios.c +++ b/src/radeon_bios.c @@ -274,12 +274,6 @@ static Bool RADEONGetLegacyConnectorInfoFromBIOS (ScrnInfoPtr pScrn) case DDC_CRT2: info->BiosConnector[i].ddc_line = RADEON_GPIO_CRT2_DDC; break; - case DDC_LCD: - info->BiosConnector[i].ddc_line = RADEON_LCD_GPIO_MASK; - break; - case DDC_GPIO: - info->BiosConnector[i].ddc_line = RADEON_MDGPIO_EN_REG; - break; default: xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Unknown DDC Type: %d\n", DDCType); break; @@ -371,9 +365,13 @@ static Bool RADEONGetLegacyConnectorInfoFromBIOS (ScrnInfoPtr pScrn) break; case DDC_LCD: info->BiosConnector[4].ddc_line = RADEON_LCD_GPIO_MASK; + info->BiosConnector[4].ddc_clk_mask = RADEON_BIOS32(tmp0 + 0x03); + info->BiosConnector[4].ddc_data_mask = RADEON_BIOS32(tmp0 + 0x07); break; case DDC_GPIO: info->BiosConnector[4].ddc_line = RADEON_MDGPIO_EN_REG; + info->BiosConnector[4].ddc_clk_mask = RADEON_BIOS32(tmp0 + 0x03); + info->BiosConnector[4].ddc_data_mask = RADEON_BIOS32(tmp0 + 0x07); break; default: xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Unknown DDC Type: %d\n", DDCType); |