From patchwork Thu May 12 13:26:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9080971 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 F1DB79F372 for ; Thu, 12 May 2016 13:26:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1EB0D2022D for ; Thu, 12 May 2016 13:26:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 24B2B2021F for ; Thu, 12 May 2016 13:26:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3A0876E896; Thu, 12 May 2016 13:26:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-x242.google.com (mail-qg0-x242.google.com [IPv6:2607:f8b0:400d:c04::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id D72E96E896 for ; Thu, 12 May 2016 13:26:20 +0000 (UTC) Received: by mail-qg0-x242.google.com with SMTP id b14so4487894qge.2 for ; Thu, 12 May 2016 06:26:20 -0700 (PDT) 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=CXVzgfGjEemNS6YkzPEWqFgZKYt7mYXfSYbJHyWGB2A=; b=WkYE3ZvifmWbpLNqaESLFQ2aRrDWMUY5Rmp75anyLCR/Qs94PrZ3fBCytz7Fwr392U 3hkdzGGBu24XDAUIvPOtAfeAfNA4E34zuWNqqNGTyDPq5fylYud5TPERAhsqRWIt15TM DrBCx+UpiVWu0f8CR8vcqV9qXVilQV/DxmUuyN/JnQZeqa2BQ4g2Gw+OQl1xJh9zfXkZ KK3rmgPfWS12+51YapuIBixwId2bKmKrSJUceFWomKS9185W9p8LcwuuLtaKcnBggOCW p8LiN+T8XXA3i0HzPRhQ5rGfQUYsxH520mE2K01S8IZVxYVTFp7Ajba/OX2rdxeCdIup ZLyw== 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=CXVzgfGjEemNS6YkzPEWqFgZKYt7mYXfSYbJHyWGB2A=; b=jydfErnx0kXwIInvXxwbAOTt73iZTv50DsuTR6FgGK2MN2jHsZe5yQ4QXY5YHMYW8l Npb34IeW8ONoPxM3YihfHD3+tqMiQFzAOmh1wannF4ZwxYSNsdIeO5TxQEb1zmmHaW7r 1HjHKlS3QRL9erQH5hOWlRp3ubNa5V6rO1w45WHu7P+Lt2LD0l/Mkrqbavgpj28NcEvf 43cHmycJvMjXG3YWRaz7M4E8BSpc42Lu1o7/zpzLtY03VZcInNgDWDCW55VkxKP8LKBZ jG4jZcMlcZ91iZOdujm0Y/CCVfM7jO5D8t33IpG4xjltENOUBMmt/maEK3BIz//McydV tnWw== X-Gm-Message-State: AOPr4FUHUTJQdQ8o9GtOAUuJ8jUmPToQzbVxNUQ4Bwzgb3N5IcyRQuxBpPVxldq67Pr+Fg== X-Received: by 10.140.144.204 with SMTP id 195mr9771994qhq.92.1463059579925; Thu, 12 May 2016 06:26:19 -0700 (PDT) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id q19sm6030873qhb.20.2016.05.12.06.26.19 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 May 2016 06:26:19 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/amdgpu: fix DP mode validation Date: Thu, 12 May 2016 09:26:13 -0400 Message-Id: <1463059573-15635-2-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1463059573-15635-1-git-send-email-alexander.deucher@amd.com> References: <1463059573-15635-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher , stable@vger.kernel.org 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=-5.5 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 Switch the order of the loops to walk the rates on the top so we exhaust all DP 1.1 rate/lane combinations before trying DP 1.2 rate/lane combos. This avoids selecting rates that are supported by the monitor, but not the connector leading to valid modes getting rejected. bug: https://bugs.freedesktop.org/show_bug.cgi?id=95206 Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c index bf731e9..7f85c2c 100644 --- a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c +++ b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c @@ -276,8 +276,8 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector } } } else { - for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) { - for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) { + for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) { + for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) { max_pix_clock = (lane_num * link_rates[i] * 8) / bpp; if (max_pix_clock >= pix_clock) { *dp_lanes = lane_num;