From patchwork Fri Sep 29 10:05:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9977407 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 E7F3960329 for ; Fri, 29 Sep 2017 10:05:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0A602967C for ; Fri, 29 Sep 2017 10:05:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D58B929809; Fri, 29 Sep 2017 10:05:54 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80A1D2967C for ; Fri, 29 Sep 2017 10:05:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751801AbdI2KFx (ORCPT ); Fri, 29 Sep 2017 06:05:53 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:42636 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751831AbdI2KFu (ORCPT ); Fri, 29 Sep 2017 06:05:50 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20170929100548euoutp020da23a40a208dc4ace5f4a17ade910df~ozREAbQE80289302893euoutp02O; Fri, 29 Sep 2017 10:05:48 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170929100547eucas1p132492fbde768c930f836ebc3488c56cd~ozRDTakMt2558325583eucas1p1X; Fri, 29 Sep 2017 10:05:47 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 7B.CA.12867.BFA1EC95; Fri, 29 Sep 2017 11:05:47 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170929100546eucas1p2b1f4313dc1f769609b10b310c2185786~ozRCsLnzj1407614076eucas1p2-; Fri, 29 Sep 2017 10:05:46 +0000 (GMT) X-AuditID: cbfec7f2-f793b6d000003243-b9-59ce1afbbe5f Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 36.27.18832.AFA1EC95; Fri, 29 Sep 2017 11:05:46 +0100 (BST) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OX100L2HDDLSN30@eusync4.samsung.com>; Fri, 29 Sep 2017 11:05:46 +0100 (BST) From: Andrzej Hajda To: Inki Dae Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, Tobias Jakobi , Daniel Drake Subject: [PATCH v2 03/11] drm/exynos/mixer: move resolution configuration to single function Date: Fri, 29 Sep 2017 12:05:34 +0200 Message-id: <20170929100542.12849-4-a.hajda@samsung.com> X-Mailer: git-send-email 2.14.1 In-reply-to: <20170929100542.12849-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrAIsWRmVeSWpSXmKPExsWy7djP87q/pc5FGly5z29xa905VouNM9az Wjya/5jZ4srX92wWk+5PYLGYcX4fk8XaI3fZLdpWf2B14PBY9D3L4373cSaPf8fYPfq2rGL0 +LxJLoA1issmJTUnsyy1SN8ugStjwZ9TLAUzBSruHdnL1sB4g7eLkZNDQsBE4uzBp0wQtpjE hXvr2boYuTiEBJYySnT8/8gK4XxmlDizuo+li5EDrOPrKh6I+DJGiSPfnzFBOP8ZJf7O+cQI MopNQFPi7+abbCC2iICyxKp97ewgRcwCy5gkDtzcxQoySVggTmL1Dz6QGhYBVYkTV3eAhXkF LCTedUhCXCQvce7BbWYQm1PAUmLx5C9guyQE5rBJXL69jw2iyEWi6dwvVghbWOLV8S3sELaM RGfHQaiGbkaJT/0n2CGcKYwS/z7MYIaospY4fPwiWDezAJ/EpG3TmSHe5JXoaBOCKPGQuLHu DitE2FHizglbiId7GCX2LXrJOIFRegEjwypGkdTS4tz01GJjveLE3OLSvHS95PzcTYzAeD39 7/inHYxfT1gdYhTgYFTi4b0hdzZSiDWxrLgy9xCjBAezkgjvE85zkUK8KYmVValF+fFFpTmp xYcYpTlYlMR5baPaIoUE0hNLUrNTUwtSi2CyTBycUg2MS/a+YQ4/E/ty3v4bvPfiPZJdqpwO bX1S/jdf5k/RMpPzz80frS9pkLy2wqTr3LY3ojK5vi6PEm8wLPUN2OoTsvmCjr7K9uUJXI+n 6jv+7fj56NoPMddc44nfG+1d60//aoxOEVodeabq/NWzdV2X+0VWcs3bd+/YDqHKj9ynr2xL 6fH+r8UopcRSnJFoqMVcVJwIAIikt0zTAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprCLMWRmVeSWpSXmKPExsVy+t/xa7q/pM5FGjTtNrK4te4cq8XGGetZ LR7Nf8xsceXrezaLSfcnsFjMOL+PyWLtkbvsFm2rP7A6cHgs+p7lcb/7OJPHv2PsHn1bVjF6 fN4kF8AaxWWTkpqTWZZapG+XwJWx4M8ploKZAhX3juxla2C8wdvFyMEhIWAi8XUVTxcjJ5Ap JnHh3nq2LkYuDiGBJYwSZ6c2sEM4jUwSNzsfsYNUsQloSvzdfJMNxBYRUJZYta8drIhZYBWT xKy2XjaQqcICcRKrf/CB1LAIqEqcuLqDFSTMK2Ah8a5DEmKZvMS5B7eZQWxOAUuJxZO/MIHY QkAlixauZ53AyLuAkWEVo0hqaXFuem6xoV5xYm5xaV66XnJ+7iZGYFhtO/Zz8w7GSxuDDzEK cDAq8fDekDsbKcSaWFZcmXuIUYKDWUmE9wnnuUgh3pTEyqrUovz4otKc1OJDjNIcLErivL17 VkcKCaQnlqRmp6YWpBbBZJk4OKUaGNl6tu6cUuinOTfzVahLq0N586HpN+IM71c+mHDHzOgV /1MeqRU91yuY1z0MbFqxpV9ArlLbtzz99t7bkkuyeVfnf1wQHLL56MHJyys33cldVZJ5oHNu 5fWrshYdUom3Hy6oPHAl52dn15L5j7s3SLMbzF3DdnjeV1bXXUJiG18fjdpkeN97wnQlluKM REMt5qLiRACXk0cgJwIAAA== X-CMS-MailID: 20170929100546eucas1p2b1f4313dc1f769609b10b310c2185786 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRvsgrw=?= =?UTF-8?B?7ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRtTYW1z?= =?UTF-8?B?dW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-CMS-RootMailID: 20170929100546eucas1p2b1f4313dc1f769609b10b310c2185786 X-RootMTR: 20170929100546eucas1p2b1f4313dc1f769609b10b310c2185786 References: <20170929100542.12849-1-a.hajda@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Screen resolution configuration depends on HW version, let's put it into single function to make it consistent and simplify the code. Signed-off-by: Andrzej Hajda Reviewed-by: Tobias Jakobi --- drivers/gpu/drm/exynos/exynos_mixer.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index ae89e53186ee..a87f60bbf2c2 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -367,7 +367,7 @@ static void mixer_vsync_set_update(struct mixer_context *ctx, bool enable) VP_SHADOW_UPDATE_ENABLE : 0); } -static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height) +static void mixer_cfg_scan(struct mixer_context *ctx, int width, int height) { struct mixer_resources *res = &ctx->mixer_res; u32 val; @@ -376,7 +376,11 @@ static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height) val = test_bit(MXR_BIT_INTERLACE, &ctx->flags) ? MXR_CFG_SCAN_INTERLACE : MXR_CFG_SCAN_PROGRESSIVE; - if (ctx->mxr_ver != MXR_VER_128_0_0_184) { + /* setup display size */ + if (ctx->mxr_ver == MXR_VER_128_0_0_184) { + mixer_reg_write(&ctx->mixer_res, MXR_RESOLUTION, + MXR_MXR_RES_HEIGHT(height) | MXR_MXR_RES_WIDTH(width)); + } else { /* choosing between proper HD and SD mode */ if (height <= 480) val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD; @@ -482,14 +486,7 @@ static void mixer_commit(struct mixer_context *ctx) else __clear_bit(MXR_BIT_INTERLACE, &ctx->flags); - /* setup display size */ - if (ctx->mxr_ver == MXR_VER_128_0_0_184) { - u32 val = MXR_MXR_RES_HEIGHT(mode->vdisplay) - | MXR_MXR_RES_WIDTH(mode->hdisplay); - mixer_reg_write(&ctx->mixer_res, MXR_RESOLUTION, val); - } - - mixer_cfg_scan(ctx, mode->vdisplay); + mixer_cfg_scan(ctx, mode->hdisplay, mode->vdisplay); mixer_cfg_rgb_fmt(ctx, mode->vdisplay); mixer_run(ctx); }