From patchwork Sun Mar 6 01:39:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Kleiner X-Patchwork-Id: 8512121 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D59C79F2F0 for ; Sun, 6 Mar 2016 01:41:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0F7C920204 for ; Sun, 6 Mar 2016 01:41:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 42B30201EF for ; Sun, 6 Mar 2016 01:41:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D5596E288; Sun, 6 Mar 2016 01:41:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com [IPv6:2a00:1450:400c:c09::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF8A96E288 for ; Sun, 6 Mar 2016 01:41:00 +0000 (UTC) Received: by mail-wm0-x233.google.com with SMTP id l68so65667055wml.0 for ; Sat, 05 Mar 2016 17:41:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gY5cA1a0lkYMcGo8wEQpP0cOSerWRuyhmhSlo+J6nTA=; b=g1Uhl2OeeD1g/RFvc0/ARHGPapIpxIsgzcEu2oWVPmDAWWLohsk3ZFJjypj++zlt/f V/dbXFDaMLj2rMC884+/IjSanHlL7IJK4bTfrXo5R4GsJjhI81bwzc3d2b+sSb6uos/f 8zktWYHMxqFHkw1vDiIBT6t0+NRCVIXXMIhbqd3VQiOpaa3VKVOjrYvMcsVlIQYEzNQ7 AVpSJw92IGwj+oDmpdJeW5LykhpalP3r6k15DqLocborri+7YNvY5XTYKwe1IKwTyIl8 7Wr+He/rjMkjLoNsWqmElpAcTrd9LN4x0o+en7sOqg1Gss5a6vtWhwvQR9/H43R0/PAt DnCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gY5cA1a0lkYMcGo8wEQpP0cOSerWRuyhmhSlo+J6nTA=; b=farXxouf6mxxGUJX47dVeAE1D5uYb1AQ5V9/rFik/nhUYacAnRL46UNVqrzFHP5Bvc DjJjhs6Xg+BMwkiGGkIZngIi4pmGrJWy9yTMUeYJ1p6bAhhP45echYGZI5ysv2abFmBI blhi1mJPMfHg7XFRUzmQa0dNJqvrIcZ1/OXrUbhf4kGguUDMEThM+S2zQXUy+iCFqRZN X0+z6z7POj+I3UCv2KNvctroOOypZlHvOZ5VNnNdnhmWizoLhymLywqcp1UfsdaipSQP xWHaZvXnE6EtHVmt0uQhI1VQ6SUblmjH74u94Ad39s0SX0tYOkDe2AhmRjK4ggtxjGS1 qF+g== X-Gm-Message-State: AD7BkJKrfAYwIj5Ja96QDxz7qtCO4offlA3CuXw1Rm0iyb7C6IVshIqSemTmOe+tjfFkjQ== X-Received: by 10.28.175.139 with SMTP id y133mr5406387wme.45.1457228459180; Sat, 05 Mar 2016 17:40:59 -0800 (PST) Received: from twisty.cin.medizin.uni-tuebingen.de (cin-11.medizin.uni-tuebingen.de. [134.2.118.242]) by smtp.gmail.com with ESMTPSA id jo6sm10569191wjb.48.2016.03.05.17.40.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 Mar 2016 17:40:57 -0800 (PST) From: Mario Kleiner To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/radeon: Don't drop DP 2.7 Ghz link setup on some cards. Date: Sun, 6 Mar 2016 02:39:53 +0100 Message-Id: <1457228393-23650-2-git-send-email-mario.kleiner.de@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457228393-23650-1-git-send-email-mario.kleiner.de@gmail.com> References: <1457228393-23650-1-git-send-email-mario.kleiner.de@gmail.com> Cc: alexander.deucher@amd.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As observed on Apple iMac10,1, DCE-3.2, RV-730, link rate of 2.7 Ghz is not selected, because the args.v1.ucConfig flag setting for 2.7 Ghz gets overwritten by a following assignment of the transmitter to use. Move link rate setup a few lines down to fix this. In practice this didn't have any positive or negative effect on display setup on the tested iMac10,1 so i don't know if backporting to stable makes sense or not. Signed-off-by: Mario Kleiner --- drivers/gpu/drm/radeon/atombios_encoders.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index a28377c..dc1e810 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c @@ -892,8 +892,6 @@ atombios_dig_encoder_setup2(struct drm_encoder *encoder, int action, int panel_m else args.v1.ucLaneNum = 4; - if (ENCODER_MODE_IS_DP(args.v1.ucEncoderMode) && (dp_clock == 270000)) - args.v1.ucConfig |= ATOM_ENCODER_CONFIG_DPLINKRATE_2_70GHZ; switch (radeon_encoder->encoder_id) { case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: args.v1.ucConfig = ATOM_ENCODER_CONFIG_V2_TRANSMITTER1; @@ -910,6 +908,10 @@ atombios_dig_encoder_setup2(struct drm_encoder *encoder, int action, int panel_m args.v1.ucConfig |= ATOM_ENCODER_CONFIG_LINKB; else args.v1.ucConfig |= ATOM_ENCODER_CONFIG_LINKA; + + if (ENCODER_MODE_IS_DP(args.v1.ucEncoderMode) && (dp_clock == 270000)) + args.v1.ucConfig |= ATOM_ENCODER_CONFIG_DPLINKRATE_2_70GHZ; + break; case 2: case 3: