From patchwork Thu Mar 6 23:15:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 3786841 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7A588BF540 for ; Thu, 6 Mar 2014 23:15:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3214201DC for ; Thu, 6 Mar 2014 23:15:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E8F9D201B4 for ; Thu, 6 Mar 2014 23:15:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A6A93FB050; Thu, 6 Mar 2014 15:15:39 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f50.google.com (mail-qa0-f50.google.com [209.85.216.50]) by gabe.freedesktop.org (Postfix) with ESMTP id F3356FB050 for ; Thu, 6 Mar 2014 15:15:37 -0800 (PST) Received: by mail-qa0-f50.google.com with SMTP id o15so3322983qap.9 for ; Thu, 06 Mar 2014 15:15:36 -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; bh=9j/ELuzXaJ1Q1U+5AmM+o6OmdltATRGU/vab8K4ZyNY=; b=m2WzOwSDLqCy529M9QwFjd2N0+u4s7qtxKMNFfcZvBD3PABexZ5FTXUhGHirfjdoR6 y+cJz8yOXTvKZKQDCQ8Q6ePVcp09eOCEDsn81MZcvfw0G2ZrkQdMsZEKFpmJYq5nDe2y BeJ/zeUjuX3PUIpvYH/voiVDFNqKZbGtwI/qEVLBdRlnPaDeRDm8qeKZEDlEroKh8F1f RP48LczPedftl1wB4+Yqb3mSSDzFLwJz+GboenMpahzILLVEwBE3p5CaTCra83zKDsj0 8f2IYwudJcWwvX4xecCGHKMabGzuN51xEHwUNvLVdbC3GYs/4B/wgXkbzLtaFpC0t8JH faWg== X-Received: by 10.229.56.200 with SMTP id z8mr11295374qcg.1.1394147736333; Thu, 06 Mar 2014 15:15:36 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id z8sm24002859qaw.17.2014.03.06.15.15.35 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Thu, 06 Mar 2014 15:15:35 -0800 (PST) From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/atom: select the proper number of lanes in transmitter setup Date: Thu, 6 Mar 2014 18:15:30 -0500 Message-Id: <1394147730-18308-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 Cc: Alex Deucher , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 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@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org 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, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 We need to check for DVI vs. HDMI when setting up duallink since HDMI is single link only. Fixes 4k modes on newer asics. bug: https://bugs.freedesktop.org/show_bug.cgi?id=75223 Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index 2cec2ab..607dc14 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c @@ -1314,7 +1314,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t } if (is_dp) args.v5.ucLaneNum = dp_lane_count; - else if (radeon_encoder->pixel_clock > 165000) + else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock)) args.v5.ucLaneNum = 8; else args.v5.ucLaneNum = 4;