diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-12-18 11:28:22 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-22 20:14:05 -0500 |
| commit | f56cd64f5f713a3013c4d980a5695c198d839671 (patch) | |
| tree | 2c6528ff36e25147aee6a579c8e815db82ad2aec | |
| parent | 3642133816f9f25065e3ca310f0720574bcdcc52 (diff) | |
drm/radeon/kms: never combine LVDS with another encoder
When linking multiple encoders to a connector, make sure
to not link LVDS with another connector. Some bioses
have the same i2c line for LVDS and VGA.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_atombios.c | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index b5912c26b1db..321044bef71c 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c | |||
| @@ -745,8 +745,7 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct | |||
| 745 | else | 745 | else |
| 746 | radeon_add_legacy_encoder(dev, | 746 | radeon_add_legacy_encoder(dev, |
| 747 | radeon_get_encoder_id(dev, | 747 | radeon_get_encoder_id(dev, |
| 748 | (1 << | 748 | (1 << i), |
| 749 | i), | ||
| 750 | dac), | 749 | dac), |
| 751 | (1 << i)); | 750 | (1 << i)); |
| 752 | } | 751 | } |
| @@ -758,32 +757,30 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct | |||
| 758 | if (bios_connectors[j].valid && (i != j)) { | 757 | if (bios_connectors[j].valid && (i != j)) { |
| 759 | if (bios_connectors[i].line_mux == | 758 | if (bios_connectors[i].line_mux == |
| 760 | bios_connectors[j].line_mux) { | 759 | bios_connectors[j].line_mux) { |
| 761 | if (((bios_connectors[i]. | 760 | /* make sure not to combine LVDS */ |
| 762 | devices & | 761 | if (bios_connectors[i].devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
| 763 | (ATOM_DEVICE_DFP_SUPPORT)) | 762 | bios_connectors[i].line_mux = 53; |
| 764 | && (bios_connectors[j]. | 763 | bios_connectors[i].ddc_bus.valid = false; |
| 765 | devices & | 764 | continue; |
| 766 | (ATOM_DEVICE_CRT_SUPPORT))) | 765 | } |
| 767 | || | 766 | if (bios_connectors[j].devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
| 768 | ((bios_connectors[j]. | 767 | bios_connectors[j].line_mux = 53; |
| 769 | devices & | 768 | bios_connectors[j].ddc_bus.valid = false; |
| 770 | (ATOM_DEVICE_DFP_SUPPORT)) | 769 | continue; |
| 771 | && (bios_connectors[i]. | 770 | } |
| 772 | devices & | 771 | /* combine analog and digital for DVI-I */ |
| 773 | (ATOM_DEVICE_CRT_SUPPORT)))) { | 772 | if (((bios_connectors[i].devices & (ATOM_DEVICE_DFP_SUPPORT)) && |
| 774 | bios_connectors[i]. | 773 | (bios_connectors[j].devices & (ATOM_DEVICE_CRT_SUPPORT))) || |
| 775 | devices |= | 774 | ((bios_connectors[j].devices & (ATOM_DEVICE_DFP_SUPPORT)) && |
| 776 | bios_connectors[j]. | 775 | (bios_connectors[i].devices & (ATOM_DEVICE_CRT_SUPPORT)))) { |
| 777 | devices; | 776 | bios_connectors[i].devices |= |
| 778 | bios_connectors[i]. | 777 | bios_connectors[j].devices; |
| 779 | connector_type = | 778 | bios_connectors[i].connector_type = |
| 780 | DRM_MODE_CONNECTOR_DVII; | 779 | DRM_MODE_CONNECTOR_DVII; |
| 781 | if (bios_connectors[j].devices & | 780 | if (bios_connectors[j].devices & (ATOM_DEVICE_DFP_SUPPORT)) |
| 782 | (ATOM_DEVICE_DFP_SUPPORT)) | ||
| 783 | bios_connectors[i].hpd = | 781 | bios_connectors[i].hpd = |
| 784 | bios_connectors[j].hpd; | 782 | bios_connectors[j].hpd; |
| 785 | bios_connectors[j]. | 783 | bios_connectors[j].valid = false; |
| 786 | valid = false; | ||
| 787 | } | 784 | } |
| 788 | } | 785 | } |
| 789 | } | 786 | } |