From patchwork Tue Dec 26 11:12:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Liu X-Patchwork-Id: 10133465 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B70E960388 for ; Wed, 27 Dec 2017 08:09:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A786E2DB66 for ; Wed, 27 Dec 2017 08:09:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C5E92DB88; Wed, 27 Dec 2017 08:09:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5D2F72DB66 for ; Wed, 27 Dec 2017 08:09:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F02089612; Wed, 27 Dec 2017 08:09:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A5D3E89906 for ; Tue, 26 Dec 2017 11:10:11 +0000 (UTC) Received: by mail-pg0-x241.google.com with SMTP id f12so17663779pgo.5 for ; Tue, 26 Dec 2017 03:10:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bqGxEHu2k4r5KqqKLeK3m7gjNvALJXRtY7bjFVxv6U0=; b=ArUnXqni6ptXbCTyfvEekEUJZiu9C2riFxznfPod5SoIUpm24oTysMR4ZUQYKSdo2M +JRxevprEDvF8BSQVYw1QpiTdx2qjPbccMfoQRSV0Y3lo+jNOgOpIsVV7XB1y7smipt7 SOoU/7ojICLMNxckH3sGUa0RXlp70uaJgoSTIaqpdtUxpaa3jG3UxmYAO1fedZF10w7S 0jNj1TbSMdzTrlM+SeS2VlNAvoOSrACYhdvwyXRy3UEAJT/O9wv7X+jh0tPQv0X8U5nR QsPjzVTO3vK2LC6Dkxmlq2QDt98ZvSkApmZp3WhIMfxwVbgkDufn70t1SSvmnbN7kCbO OrIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bqGxEHu2k4r5KqqKLeK3m7gjNvALJXRtY7bjFVxv6U0=; b=O4eFqF0uAxu9WOlN1tu6LY8goLQQmI+Zdg8tTurgmhUP2qQw1Ux0ANEv725ODaTE1V Qwrp41JxgR+tZHxvXPLFyfP2df6g6xg63Bwe2l2mRA/ch4NAjNuuD3QYbj/GYm95a4kC +GeNmv7ldkK7EKyb1rKkGTpfpeuSr3PKMSv4ts8CFIi7dAiRi/ZHeID9EsOlBG6ig/G4 PyGGkhWBoAWJ6frK9GlR+fiCT0wjBDCgmRqY7NUNJJEu9MKx2Z5/mrI1An0E2XZJbNwC FiJvuv9kyOx+0STKe0jBb6efgsFMhF7xnviRTODsq/8B7Umr/EBgNxtSaHchy4a6r7Xk LsSw== X-Gm-Message-State: AKGB3mLTZ9/zIkMjhlfZCgepBbYeSRzcDzQW8/IRaFgfTkEaPNldzOUq 4QCKOrfnGSCBCZkfZ9rR9Ic= X-Google-Smtp-Source: ACJfBot2ccbNTpCWPqdgxsRghuFILwLbJ8SWCC9uwFyG9mmDxIUrSlyab+99DzmrWQRcPggkVhH6PQ== X-Received: by 10.101.89.5 with SMTP id f5mr22388990pgu.370.1514286610970; Tue, 26 Dec 2017 03:10:10 -0800 (PST) Received: from 60-242-179-244.static.tpgi.com.au (60-242-179-244.static.tpgi.com.au. [60.242.179.244]) by smtp.gmail.com with ESMTPSA id q24sm60633048pfk.168.2017.12.26.03.10.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Dec 2017 03:10:10 -0800 (PST) From: Jonathan Liu To: Maxime Ripard , David Airlie , Chen-Yu Tsai Subject: [PATCH v2 3/3] drm/sun4i: hdmi: Add missing rate halving check in sun4i_tmds_determine_rate Date: Tue, 26 Dec 2017 22:12:27 +1100 Message-Id: <20171226111227.4526-4-net147@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171226111227.4526-1-net147@gmail.com> References: <20171226111227.4526-1-net147@gmail.com> X-Mailman-Approved-At: Wed, 27 Dec 2017 08:09:10 +0000 Cc: linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com, Jonathan Liu , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.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-Virus-Scanned: ClamAV using ClamSMTP It was only checking the divider when determing the closest match if it could not match the requested rate exactly. For a projector connected to an Olimex A20-OLinuXino-LIME using HDMI with a native resolution of 1280x800 and pixel clock of 83.5 MHz, this resulted in 1280x800 mode not being available and the following in dmesg when the kernel is booted with drm.debug=0x3e: [drm:drm_mode_debug_printmodeline] Modeline 37:"1280x800" 60 83500 1280 1352 1480 1680 800 810 816 831 0x48 0x5 [drm:drm_mode_prune_invalid] Not using 1280x800 mode: NOCLOCK Fixes: 9c5681011a0c ("drm/sun4i: Add HDMI support") Signed-off-by: Jonathan Liu --- drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c index 88eeeaf34638..3ecffa52c814 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c @@ -102,9 +102,12 @@ static int sun4i_tmds_determine_rate(struct clk_hw *hw, goto out; } - if (!best_parent || abs(rate - rounded / i) < - abs(rate - best_parent / best_div)) { + if (!best_parent || + abs(rate - rounded / i / j) < + abs(rate - best_parent / best_half / + best_div)) { best_parent = rounded; + best_half = i; best_div = j; } }