diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2011-10-28 16:07:36 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-11-03 17:53:22 +0000 |
| commit | cf2aff6eff251b6fbdaf8c253e65ff7c693de8cd (patch) | |
| tree | b3552806ef0ba882b4e60b59a87354f862369e0d | |
| parent | 64912e997f0fe13512e4c7b90e4f7c11cb922ab5 (diff) | |
| download | linux-3.10-cf2aff6eff251b6fbdaf8c253e65ff7c693de8cd.tar.gz linux-3.10-cf2aff6eff251b6fbdaf8c253e65ff7c693de8cd.tar.bz2 linux-3.10-cf2aff6eff251b6fbdaf8c253e65ff7c693de8cd.zip | |
drm/radeon/kms: fix DP setup on TRAVIS bridges
Supposedly both NUTMEG and TRAVIS should use the same
panel mode, but switching the panel mode for TRAVIS
gets things working.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=41569
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_dp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index ff47186b562..a0de48542f7 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c @@ -560,9 +560,12 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, if (!ASIC_IS_DCE4(rdev)) return; - if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) != - ENCODER_OBJECT_ID_NONE) + if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) == + ENCODER_OBJECT_ID_NUTMEG) panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE; + else if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) == + ENCODER_OBJECT_ID_TRAVIS) + panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP); if (tmp & 1) |