From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C330C32750 for ; Fri, 2 Aug 2019 09:48:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF9632087E for ; Fri, 2 Aug 2019 09:48:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739313; bh=cZx6DrEAeYsD+7q65I58DvXIk8m/IOX9Is9tpEABRqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2C2L6ly6yh1BLlfq2hlbUJmL55w+akqrMSHOdS6NZ6z5mUzsAOCVi7Yb+0rVQenVb Q270HQsEKj4otcrk8vNvZ/X2dKO24Fk9zLYWmMwY9xNZ6siphNrpFxG4kvMGTqlOTq ravqVjBzJhlp/CVGdH0+CqPn/XBDCf9XwqYyeHEQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405773AbfHBJsB (ORCPT ); Fri, 2 Aug 2019 05:48:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:53118 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404909AbfHBJr7 (ORCPT ); Fri, 2 Aug 2019 05:47:59 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E62020B7C; Fri, 2 Aug 2019 09:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739279; bh=cZx6DrEAeYsD+7q65I58DvXIk8m/IOX9Is9tpEABRqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qCEJ2pidvqT/wScK91cRmIA5I8OsLCY5nH4Vw5OPJ5kVsvZfTCx7xfcZ2vhKW2D9b ziNxPTDV2W8YW1jjdpSg2mLnku3fHT4JKAqPKLm7A2DlPkaID6RuqxJVJArTFNykYU UVS8UnEINhjsL9XaVbvMLQoJy/HP2zFxQ5Z8kfKM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Douglas Anderson , Sean Paul , Yakir Yang , Heiko Stuebner , Sasha Levin Subject: [PATCH 4.9 172/223] drm/rockchip: Properly adjust to a true clock in adjusted_mode Date: Fri, 2 Aug 2019 11:36:37 +0200 Message-Id: <20190802092249.043812255@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092238.692035242@linuxfoundation.org> References: <20190802092238.692035242@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 99b9683f2142b20bad78e61f7f829e8714e45685 ] When fixing up the clock in vop_crtc_mode_fixup() we're not doing it quite correctly. Specifically if we've got the true clock 266666667 Hz, we'll perform this calculation: 266666667 / 1000 => 266666 Later when we try to set the clock we'll do clk_set_rate(266666 * 1000). The common clock framework won't actually pick the proper clock in this case since it always wants clocks <= the specified one. Let's solve this by using DIV_ROUND_UP. Fixes: b59b8de31497 ("drm/rockchip: return a true clock rate to adjusted_mode") Signed-off-by: Douglas Anderson Signed-off-by: Sean Paul Reviewed-by: Yakir Yang Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20190614224730.98622-1-dianders@chromium.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 32d87c6035c9..5bed63eee5f0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -865,7 +865,8 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc, struct vop *vop = to_vop(crtc); adjusted_mode->clock = - clk_round_rate(vop->dclk, mode->clock * 1000) / 1000; + DIV_ROUND_UP(clk_round_rate(vop->dclk, mode->clock * 1000), + 1000); return true; } -- 2.20.1