From patchwork Fri Aug 24 09:24:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 10576513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C40801390 for ; Mon, 27 Aug 2018 07:36:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC6672981D for ; Mon, 27 Aug 2018 07:36:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A069229823; Mon, 27 Aug 2018 07:36:00 +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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 576512981D for ; Mon, 27 Aug 2018 07:36:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B7726E1CF; Mon, 27 Aug 2018 07:35:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0111.outbound.protection.outlook.com [104.47.2.111]) by gabe.freedesktop.org (Postfix) with ESMTPS id A10386E65F for ; Fri, 24 Aug 2018 09:25:19 +0000 (UTC) Received: from orc.pedanet (85.226.244.23) by HE1PR0201MB2458.eurprd02.prod.outlook.com (2603:10a6:3:81::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1059.22; Fri, 24 Aug 2018 09:25:16 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] drm/atmel-hlcdc: prefer a higher rate clock as pixel-clock base Date: Fri, 24 Aug 2018 11:24:57 +0200 Message-Id: <20180824092458.13165-2-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180824092458.13165-1-peda@axentia.se> References: <20180824092458.13165-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: VI1PR0701CA0045.eurprd07.prod.outlook.com (2603:10a6:800:90::31) To HE1PR0201MB2458.eurprd02.prod.outlook.com (2603:10a6:3:81::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bfeafc91-ef5d-48fd-d88d-08d609a38186 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989137)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:HE1PR0201MB2458; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0201MB2458; 3:l7d/0elew4uc2INTLHL07jNsdbBDZWU36p8jNYt3Gex9CG+BarQeP5txq81aEnxHDBvaTRt/fMVzB5S8eSbs7oB6kwhoKXFRjKgjFi/zF6xeDkOQfHtGJXMx/0QIrO+XLZujJ0jwDmUkKUy1TvvGWLkTfk7P9jY63xAnGQc0PedhiTQAgpKYwaCPmp2ykmBLk+a6q/j5rQOlcqqj5drXxr+5+4N96eSk7ydIq4p88T1vRajqBNQNo1Yc0V0OsAnk; 25:dN3F8QCi4w2vq7EyJc2/BVFvJsS/vm/4WJUPcvcJZj/oUINJmLyKHI4IevELwE5BPLSdGAjrPPXDv4ZVsfbkaLzc+A2Un3jQ3ZgDa1rG3D3zHLD7ve44jzBGxUlUTenPRVgOhxX3MPr604VlGE9jSzHiqXFk6Lq0/JdWRL+7sQpfYSEGipQpdWQZBjJR84BVsE4lmOI4UfoUTaOBJ/BtmT5LeVZb6waylSt3NekmCsIZ6BGTgEwpCGPwAbthDUAia/dzfmKZGOg5jHvaXlmFWJU1UDPL11ipNMlqBT6ENm0FqU1Zol0PfTNK/gB1GUmDKBh3uiNLRfuF8uOBQjSYkA==; 31:6kfW7J/5HB5J/3ALX/d05kceRGiWPcZkQmCNtu2HwnEEAhR9Vx9ifjCszg1EoebHydsukEb82x+B3t/6oFSfnSCcFFacQrWodbU/csD65LMJXV722U0ycwhpoMFJVUfMWAUHmNIHmqFKS8DYBAno+DdMO2VuHLB/2yoWG1X6u4wB6ZbYicU1+1LYf+ybQKQsLyWhXBd+x2pEq9dr014kfSy1rs/hBYj3QuhA5s0HdNw= X-MS-TrafficTypeDiagnostic: HE1PR0201MB2458: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(823301075)(3231311)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(149027)(150027)(6041310)(20161123560045)(2016111802025)(20161123564045)(20161123562045)(20161123558120)(6043046)(201708071742011)(7699016); SRVR:HE1PR0201MB2458; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0201MB2458; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0201MB2458; 4:759pihfiMtBZh43kDYaZi3qbrxcqA6CGj85pniEq2AQBTLlku0n0UtMRdOtS57yhcveByoS/FeNMLPvlcEo3OI5bUejKs/6crAFDmQmMMByoM57jz5xgn39BEF18tVqkB0/IpEXSmXtWa8QKbqe+OHtYMK3jB28kYpN2gMPMd7YjAzCtn248/XfjkZcRDmbImN7YN7cYgYtgTwA/189gWdwoeb6TobKNmKfvWMFwO51dMruxsTX7CG8lhpX/1TOUXyV2Shc2nJkzKB6e0veOgw== X-Forefront-PRVS: 07749F8C42 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(39830400003)(396003)(136003)(366004)(346002)(189003)(199004)(386003)(16526019)(186003)(1076002)(316002)(956004)(2616005)(25786009)(52116002)(476003)(51416003)(36756003)(26005)(6346003)(446003)(6506007)(6916009)(11346002)(6666003)(8936002)(4326008)(50226002)(76176011)(54906003)(16586007)(68736007)(3846002)(2361001)(6116002)(5660300001)(86362001)(6512007)(6486002)(105586002)(53936002)(106356001)(48376002)(74482002)(2351001)(50466002)(81166006)(7736002)(47776003)(66066001)(8676002)(2906002)(81156014)(478600001)(486006)(97736004)(305945005)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0201MB2458; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0201MB2458; 23:xRGWuQwO/4VefB3+SXe0U4JAW+Mu5LTUmE5Nc2U?= 0Biv2nXS6SD7YwrcLWtGZzWL45oztE6LljEWTIBXAeA98B2zhoa+NvQgWZHkXPGk578jHBnHZsSv9ozhtgmFljGLGOpMZDXZC52Ad0f5YOWxh3SAE4FWxjYrC0TR+f5ImY01LgtOzi4ZMV3bgbhv4OdV+ElQV5fjL+a6tmuUE+YNMWVcSZf6Iia36vt7zz0uDofF0DYoEUQtgJ/ICHUqfluPQ5n3uuDESUnsqo8rkt1c2Auyc9E9ng5eyMzYg0DCFx+kXUyMl7/UvTM7PBMV9FKubpOID/kNMisSw7QfnYDMdOmwYAhV8CcV9/QO/I/SKU0ulIAlOwuYMQSWs3tT2ZU3g6ZD8SwbYAA0wSFvMeO4zhj0KYXAGmrSSfgD9Oz3HrpihI0hsPey54HEKBWbIsxquq5MACO64SPH0J85ymj5lDP42F/PR9UqI7riyFswrsPNKn16I9ptIf2f17/A5PrbPPg7kEuRx4cqajN6ZdGGRonPxtlYlNfpRFq0/NEd1HOyatfW563TOCoybTYi/PGULI7gvJcjeVz/0jAB7fzVPKn7rhUjnDTxfQIJ3AoOxTNuoOyjiaEDafloC3tro0D/n5p561HA5fq7zbXBOPsRfFDEN7rilVw71VEmkx7CkyXQmUziv0y5YSFLDbkJxRvMt6MR5ja5r5obXJkaOcC5lGrp2yKbPDXUCj9DqAFHnANjmthtqWyi/GS7NkgprqX3ZNDhoX9EOneKvrWfdJu4vmpn6o1ZdczZD5lMjjQ1/leT/VFqgWpFtUEcUbsN1DeMYN0ffyKiaYYjugvV4FfGfpLG4MFIClW2JG6HepdhVHbtkn+DjeNPiXL811+R3KeXxZGL/VmqFftd7cTsxEulTGn2vXjMn40Qi2IyckbLfbpeDr/XAvFY+orl3q0U21wx44ZeHIjE60C8t8rr+fxRBgdfleN7K6Ef9uEPQ5jUebrpaemxqN++m43Jycm5XWwBlF699pFWulrNPb/uBvcQrFBZ9gqcgXSL1Aa194EdQgIbSxwVd6E+frVrp/LebVIr8Qg/yYY9q0IYJeCZ5ZH4lE6hzWQ8SqP4gbWhbKCdZo47Mww32YZMvC0oYBIOmHKatzWzWGOHFLdrdr2Xx3VR48B8qsG5/bPnsL4p8GBFAUuZIHI1wTpLepMbBLfnITaUf6PWhsx1JIxRhw4itMcqmzohslS4kdull9rjHAv6/Rpnrs1g4JIjWINQdw36Jvv+hteZFnW4zA7xRkWUV6ci3TKE8GAjL/v40/+8ivJRQxAg= X-Microsoft-Antispam-Message-Info: sdok2G+OeEcdQiAUNKzUFvOXeIJnYfJ0VhmBL4SKbblyZXH0YCaQ6iLa01cz8RWthvasTcIUttngTOnmC6rdZDZGHIYfQ+JXQvR+HLIXktwvG9hGCUtbJC6oNNIS7W1l6r/hX3sghf9IRzYEAntYMf0f3mbYjXpG9G358tEJvDtM80KceSalCBBVfV9IvZk/0Oc/cLO+6ud0SaOypKxzoEI3uT9hFF4+rxOYJabY5RHRYx5M7asrtI5x2Z56dq+9PaYgnvFfOT+HvEATPpD/GTPJXgW9UqCFwWGhGkCoUwqJxtAf6eR+zAeSGxU1h+AHEkGDx+qVThfKmeyt1+IPfBRA5VWckf3ZnjdnyVxY4Ck= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0201MB2458; 6:LuoRXK6+am6q8XafRQmppmR3gFxnfNd4w1lwWBUPbaXGVlQNL2ScFwifkRzjxLBD5PghRC3FX6Ty4L0eYtpcxGjq6F84z7pEfdZCm0m0g3c3cgVm6EpZXrsif541/M8wQVfhBKjgaBWEbUQzRU8Bl/AY7t3AWwZ20gPG8eFigAXBKOiiufEq6EvBpv0QdGztt4hpjvKutkZ++dZdGpGigTDnW3XrOjcN8J/SOQqUMtN0cy2lQ7tAaiWt8sC3x2bzHm/X15iTU5LI5bFFTYC2cZOl5gvQ154ZBds7G5IBqrOqvduWyBBu/AqnhJWAyw+784QgkP2FCItAB7OSh6ULnXgILMj1khCmKqcMg2cCMkXGM0EmKN9xpsWz2GGfoeec2d0ByFFwQHJmYmvcjksTUnp/nhsc4hu64tb68+YDBJ/uMIVoZTTnmmZtRIME2JiyExWL6wlxQnpTuMkxHPFG/A==; 5:mWEZUIci6EUI+gPU7LU8J8gPeWlx/AHzU48lKVvMptjoK7cdOK3ps9MTg9HTKq0VMYPI1pcxx0T8UrjLorcRTyAENtDzU6mwVYbhRrMJoddT2sY0DekkA0OKSX3a79dF84zGNEOEIh/n9BbuW0rzdXniay0Vyp9U+l3xbyO0C4E=; 7:bbBm5J5WOHDlNK4dSHwU331cbgZQTpTZc2CIxHpGsAEzJjqGI59pjmh1mHlxTCBhJtcYNoK0dSe5FjXHiUJE0Bcu7pNMwrACokMkgRxLLOA4ziDJVpYJq5SDxtFfebST2zwk4v2AAUeRdR5ve9HqVbUEVxPEUGKzeq7Bc4/m6Ffd2lHne7M1lN9SJgLWT00Qny6QQqZv5yhKz7856ddNzLG3wOMWer3XJ4xmmgnU2+qPIThpaWs5hXPCBvWbg8NO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2018 09:25:16.8934 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bfeafc91-ef5d-48fd-d88d-08d609a38186 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0201MB2458 X-Mailman-Approved-At: Mon, 27 Aug 2018 07:34:44 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , David Airlie , Nicolas Ferre , dri-devel@lists.freedesktop.org, Boris Brezillon , Peter Rosin , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP If the divider used to get the pixel-clock is small, the granularity of the frequencies possible for the pixel-clock is quite coarse. E.g. requesting a pixel-clock of 65MHz with a sys_clk of 132MHz results in the divider being set to 3 ending up with 44MHz. By preferring the doubled sys_clk as base, the divider instead ends up as 5 yielding a pixel-clock of 52.8Mhz, which is a definite improvement. While at it, clamp the divider so that it does not overflow in case it gets big. Signed-off-by: Peter Rosin --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c index c38a479ada98..0d9d1042752a 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c @@ -101,18 +101,22 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) (adj->crtc_hdisplay - 1) | ((adj->crtc_vdisplay - 1) << 16)); - cfg = 0; + cfg = ATMEL_HLCDC_CLKSEL; - prate = clk_get_rate(crtc->dc->hlcdc->sys_clk); + prate = 2 * clk_get_rate(crtc->dc->hlcdc->sys_clk); mode_rate = adj->crtc_clock * 1000; - if ((prate / 2) < mode_rate) { - prate *= 2; - cfg |= ATMEL_HLCDC_CLKSEL; - } div = DIV_ROUND_UP(prate, mode_rate); - if (div < 2) + if (div < 2) { div = 2; + } else if (ATMEL_HLCDC_CLKDIV(div) & ~ATMEL_HLCDC_CLKDIV_MASK) { + /* The divider ended up too big, try a lower base rate. */ + cfg &= ~ATMEL_HLCDC_CLKSEL; + prate /= 2; + div = DIV_ROUND_UP(prate, mode_rate); + if (ATMEL_HLCDC_CLKDIV(div) & ~ATMEL_HLCDC_CLKDIV_MASK) + div = ATMEL_HLCDC_CLKDIV_MASK; + } cfg |= ATMEL_HLCDC_CLKDIV(div);