diff options
| author | Alex Deucher <alex@botch2.(none)> | 2008-02-07 19:27:38 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2008-02-07 19:27:38 -0500 |
| commit | e8899b9978291c62a65f468c92f340f65ad5479d (patch) | |
| tree | b68fe8222530c38312de703975f06397854776fe /src/radeon_output.c | |
| parent | 435de6c4e46ff2bebd4cee58888a66b936cd3fdf (diff) | |
R6xx: fix ddc after my i2c rework
Seems r6xx does something different for its i2c table,
revert to the old behavior for now.
Diffstat (limited to 'src/radeon_output.c')
| -rw-r--r-- | src/radeon_output.c | 47 |
1 files changed, 42 insertions, 5 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index 5ef864e8..248f94aa 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -1382,7 +1382,44 @@ legacy_setup_i2c_bus(int ddc_line) i2c.put_data_reg = ddc_line; i2c.get_clk_reg = ddc_line; i2c.get_data_reg = ddc_line; - i2c.valid = TRUE; + if (ddc_line) + i2c.valid = TRUE; + else + i2c.valid = FALSE; + + return i2c; +} + +RADEONI2CBusRec +atom_setup_i2c_bus(int ddc_line) +{ + RADEONI2CBusRec i2c; + + if (ddc_line == AVIVO_GPIO_0) { + i2c.put_clk_mask = (1 << 19); + i2c.put_data_mask = (1 << 18); + i2c.get_clk_mask = (1 << 19); + i2c.get_data_mask = (1 << 18); + i2c.mask_clk_mask = (1 << 19); + i2c.mask_data_mask = (1 << 18); + } else { + i2c.put_clk_mask = (1 << 0); + i2c.put_data_mask = (1 << 8); + i2c.get_clk_mask = (1 << 0); + i2c.get_data_mask = (1 << 8); + i2c.mask_clk_mask = (1 << 0); + i2c.mask_data_mask = (1 << 8); + } + i2c.mask_clk_reg = ddc_line; + i2c.mask_data_reg = ddc_line; + i2c.put_clk_reg = ddc_line + 0x8; + i2c.put_data_reg = ddc_line + 0x8; + i2c.get_clk_reg = ddc_line + 0xc; + i2c.get_data_reg = ddc_line + 0xc; + if (ddc_line) + i2c.valid = TRUE; + else + i2c.valid = FALSE; return i2c; } @@ -1920,28 +1957,28 @@ static void RADEONSetupGenericConnectors(ScrnInfoPtr pScrn) if (IS_AVIVO_VARIANT) { if (info->IsMobility) { - info->BiosConnector[0].ddc_i2c = legacy_setup_i2c_bus(0x7e60); + info->BiosConnector[0].ddc_i2c = atom_setup_i2c_bus(0x7e60); info->BiosConnector[0].DACType = DAC_NONE; info->BiosConnector[0].TMDSType = TMDS_NONE; info->BiosConnector[0].ConnectorType = CONNECTOR_LVDS; info->BiosConnector[0].devices = ATOM_DEVICE_LCD1_SUPPORT; info->BiosConnector[0].valid = TRUE; - info->BiosConnector[1].ddc_i2c = legacy_setup_i2c_bus(0x7e40); + info->BiosConnector[1].ddc_i2c = atom_setup_i2c_bus(0x7e40); info->BiosConnector[1].DACType = DAC_PRIMARY; info->BiosConnector[1].TMDSType = TMDS_NONE; info->BiosConnector[1].ConnectorType = CONNECTOR_VGA; info->BiosConnector[1].devices = ATOM_DEVICE_CRT1_SUPPORT; info->BiosConnector[1].valid = TRUE; } else { - info->BiosConnector[0].ddc_i2c = legacy_setup_i2c_bus(0x7e50); + info->BiosConnector[0].ddc_i2c = atom_setup_i2c_bus(0x7e50); info->BiosConnector[0].DACType = DAC_TVDAC; info->BiosConnector[0].TMDSType = TMDS_INT; info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I; info->BiosConnector[0].devices = ATOM_DEVICE_CRT2_SUPPORT | ATOM_DEVICE_DFP1_SUPPORT; info->BiosConnector[0].valid = TRUE; - info->BiosConnector[1].ddc_i2c = legacy_setup_i2c_bus(0x7e40); + info->BiosConnector[1].ddc_i2c = atom_setup_i2c_bus(0x7e40); info->BiosConnector[1].DACType = DAC_PRIMARY; info->BiosConnector[1].TMDSType = TMDS_NONE; info->BiosConnector[1].ConnectorType = CONNECTOR_VGA; |