From patchwork Fri May 20 08:34:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 802732 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4K8aGmv022126 for ; Fri, 20 May 2011 08:36:37 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 269B19E989 for ; Fri, 20 May 2011 01:36:16 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qw0-f49.google.com (mail-qw0-f49.google.com [209.85.216.49]) by gabe.freedesktop.org (Postfix) with ESMTP id A2D959E7F2 for ; Fri, 20 May 2011 01:34:42 -0700 (PDT) Received: by qwi2 with SMTP id 2so2100906qwi.36 for ; Fri, 20 May 2011 01:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=9uFTIZ0WFnsO2r1UYCY4NJ3ICguNaBMOg4zTNG/AyzY=; b=XXsYDB6MrDAVrbcWlFGCKXwdQDHcyE635KgiWeSYc2Lx2evUBl3qdqmfuOfMFZP/V6 uLOVRhsdAf75W2owB33q/p4q1WBnoS3owPYrh64lHuDFV4eFmR/OQNYIu604Wv1nG5QB 1MalUEhlffm9j9XJ9f8MZZbrx/aQjHaFdtmG4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=BDz1dnJaSVLQI/JYDBOjFZC27VSlOGr5HJKOc+B05LNEpt90csQv+yiVx0ywsi1jp4 0WG4EQgrdJOoaM/4vbhRYm/NxCx+sSnFwRpQMeRuNWZeQ7NScDUVdIl3vbdKu3qE51+L yZzJt/d1oxVD4ffJtzy3sLqV6biHZIz6scxAI= Received: by 10.224.193.135 with SMTP id du7mr3222359qab.213.1305880481918; Fri, 20 May 2011 01:34:41 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id s9sm2112372qco.36.2011.05.20.01.34.40 (version=SSLv3 cipher=OTHER); Fri, 20 May 2011 01:34:40 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH 01/18] drm/radeon/kms: DCE4.1 DIG encoders are fully routeable just like DCE3.2 Date: Fri, 20 May 2011 04:34:14 -0400 Message-Id: <1305880471-1472-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 20 May 2011 08:36:37 +0000 (UTC) Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/radeon_encoders.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 9947748..b2e0b58 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -931,10 +931,10 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t else args.v3.ucLaneNum = 4; - if (dig->linkb) { + if (dig->linkb) args.v3.acConfig.ucLinkSel = 1; + if (dig->dig_encoder & 1) args.v3.acConfig.ucEncoderSel = 1; - } /* Select the PLL for the PHY * DP PHY should be clocked from external src if there is @@ -1601,12 +1601,9 @@ static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder) /* DCE4/5 */ if (ASIC_IS_DCE4(rdev)) { dig = radeon_encoder->enc_priv; - if (ASIC_IS_DCE41(rdev)) { - if (dig->linkb) - return 1; - else - return 0; - } else { + if (ASIC_IS_DCE41(rdev)) + return radeon_crtc->crtc_id; + else { switch (radeon_encoder->encoder_id) { case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: if (dig->linkb)