From f76b289fb78d436dbf8f862449049f71c309b555 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 28 Oct 2011 16:07:36 -0400 Subject: [PATCH] --- yaml --- r: 275007 b: refs/heads/master c: cf2aff6eff251b6fbdaf8c253e65ff7c693de8cd h: refs/heads/master i: 275005: 545b835fb738316b0d12f9f26170a27e18242669 275003: 8820070e53ef8a7e13309fe183bf048b70a00ec3 274999: d23744f44b457a2d9a50192c36e37347728ff150 274991: ef149397dd0bcedfa261720c715eed3376588bc4 274975: 4094a3288bdf695d5daf1e6f2b5346994ee5a818 274943: a6508ab2abb1b771b102de1c601410707696809a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/atombios_dp.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4beec4943bdc..a8bbae873a2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64912e997f0fe13512e4c7b90e4f7c11cb922ab5 +refs/heads/master: cf2aff6eff251b6fbdaf8c253e65ff7c693de8cd diff --git a/trunk/drivers/gpu/drm/radeon/atombios_dp.c b/trunk/drivers/gpu/drm/radeon/atombios_dp.c index ff47186b5629..a0de48542f71 100644 --- a/trunk/drivers/gpu/drm/radeon/atombios_dp.c +++ b/trunk/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)