From 651e8aabdedaa00043c5da7112b6bf85b893cafa Mon Sep 17 00:00:00 2001 Message-Id: <651e8aabdedaa00043c5da7112b6bf85b893cafa.1329290089.git.jesse.sung@canonical.com> In-Reply-To: References: From: Alex Deucher Date: Thu, 2 Feb 2012 10:18:00 -0500 Subject: [PATCH 2/2] drm/radeon/kms: fix TRAVIS panel setup MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.7.9" This is a multi-part message in MIME format. --------------1.7.9 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit Different versions of the DP to LVDS bridge chip need different panel mode settings depending on the chip version used. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=41569 Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie (cherry picked from commit 304a48400d9718f74ec35ae46f30868a5f4c4516) Signed-off-by: Wen-chien Jesse Sung --- drivers/gpu/drm/radeon/atombios_dp.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) --------------1.7.9 Content-Type: text/x-patch; name="0002-drm-radeon-kms-fix-TRAVIS-panel-setup.patch" Content-Transfer-Encoding: 8bit Content-Disposition: inline; filename="0002-drm-radeon-kms-fix-TRAVIS-panel-setup.patch" diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index 03a347a..6a1879a 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c @@ -564,9 +564,21 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, 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) { + ENCODER_OBJECT_ID_TRAVIS) { + u8 id[6]; + int i; + for (i = 0; i < 6; i++) + id[i] = radeon_read_dpcd_reg(radeon_connector, 0x503 + i); + if (id[0] == 0x73 && + id[1] == 0x69 && + id[2] == 0x76 && + id[3] == 0x61 && + id[4] == 0x72 && + id[5] == 0x54) + panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE; + else + 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) panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; --------------1.7.9--