From patchwork Wed Sep 6 10:36:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9940299 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 D52D460224 for ; Wed, 6 Sep 2017 10:37:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB5DB1FF27 for ; Wed, 6 Sep 2017 10:37:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF41E28B90; Wed, 6 Sep 2017 10:37:37 +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 76CBA1FF27 for ; Wed, 6 Sep 2017 10:37:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753113AbdIFKhg (ORCPT ); Wed, 6 Sep 2017 06:37:36 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:51598 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753073AbdIFKhd (ORCPT ); Wed, 6 Sep 2017 06:37:33 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20170906103730euoutp02b15625ec21d37de6612488b59f368012~hv3L0j__i0812708127euoutp023; Wed, 6 Sep 2017 10:37:30 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170906103730eucas1p1302eb4df9e53f11ac2f0103839884a42~hv3K-Zxxb0372303723eucas1p1j; Wed, 6 Sep 2017 10:37:30 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 23.E1.12867.9EFCFA95; Wed, 6 Sep 2017 11:37:29 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170906103729eucas1p1ea88d3ce8fc8d7c07f71fcdc12a5d4d0~hv3KTnR_M2623226232eucas1p1J; Wed, 6 Sep 2017 10:37:29 +0000 (GMT) X-AuditID: cbfec7f2-f793b6d000003243-a0-59afcfe9fb75 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id A1.FA.20118.9EFCFA95; Wed, 6 Sep 2017 11:37:29 +0100 (BST) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OVU00L0NTIFI200@eusync1.samsung.com>; Wed, 06 Sep 2017 11:37:29 +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 03/10] drm/exynos/mixer: move resolution configuration to single function Date: Wed, 06 Sep 2017 12:36:53 +0200 Message-id: <1504694220-15818-4-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1504694220-15818-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMIsWRmVeSWpSXmKPExsWy7djP87ovz6+PNPjYbGRxa905VouNM9az Wjya/5jZ4srX92wWk+5PYLGYcX4fk8XaI3fZLdpWf2B14PBY9D3L4373cSaPf8fYPfq2rGL0 +LxJLoA1issmJTUnsyy1SN8ugSvjxsUHzAUX+CsOLTrB3sA4hbeLkZNDQsBE4vLyq8wQtpjE hXvr2boYuTiEBJYySmy+08MC4XxmlLg8oYMNpmPVmUOMEIlljBKn37dBtfxnlLj5biVYFZuA psTfzTfBbBEBZYlV+9rZQYqYBZYxSRy4uYsVJCEsEC3Rv30/C4jNIqAqce3LS7A4r4CzxM27 y6DWyUncPNcJdiCngIvEqeufWCHiU9gkDs63h7BdJCb2N0PFhSVeHd/CDmHLSFye3A32g4RA N6PEp/4T7BDOFEaJfx9mQL1tLXH4+EWwbmYBPolJ26YDxTmA4rwSHW1CECUeEj/O7YNa4Cgx uf0+NGCmAwPmz3uWCYzSCxgZVjGKpJYW56anFhvrFSfmFpfmpesl5+duYgRG7el/xz/tYPx6 wuoQowAHoxIP74Mf6yKFWBPLiitzDzFKcDArifD+Pbc+Uog3JbGyKrUoP76oNCe1+BCjNAeL kjivbVRbpJBAemJJanZqakFqEUyWiYNTqoFxaQpvx/5v0x9+v8O7W3PrM9M5ub8rLr5sP7B7 7Vunv992cPbqlq1UDI1tvNLZyXDqk/2ud6eNS+ammXrLC62ckTGBY6POEmYbOR7xpbOuXb3m fu5kLJNG2sFc8z8HNb4y5jTFrlg8YdGJdYdu/K3yunzks53/rUj7k9sXfshUd5HQElzY/X/W EiWW4oxEQy3mouJEAHhwN+fWAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprGLMWRmVeSWpSXmKPExsVy+t/xy7ovz6+PNLh/nsXi1rpzrBYbZ6xn tXg0/zGzxZWv79ksJt2fwGIx4/w+Jou1R+6yW7St/sDqwOGx6HuWx/3u40we/46xe/RtWcXo 8XmTXABrFJdNSmpOZllqkb5dAlfGjYsPmAsu8FccWnSCvYFxCm8XIyeHhICJxKozhxghbDGJ C/fWs4HYQgJLGCUu7QjqYuQCshuZJD62nAJLsAloSvzdfBPMFhFQlli1r50dpIhZYBWTxKy2 XrCEsEC0RP/2/SwgNouAqsS1Ly9ZQWxeAWeJm3eXsUFsk5O4ea6TGcTmFHCROHX9EyvEZmeJ mQ8XMU5g5F3AyLCKUSS1tDg3PbfYSK84Mbe4NC9dLzk/dxMjMLS2Hfu5ZQdj17vgQ4wCHIxK PLyWG9ZFCrEmlhVX5h5ilOBgVhLh/XtufaQQb0piZVVqUX58UWlOavEhRmkOFiVx3t49qyOF BNITS1KzU1MLUotgskwcnFINjFXzd4ZMk/v6Yu1lM/3C6R5Xz2wzv2R36JKisGrFtKR8x1/n fs3R+M77rfxz1tuJr5k+mk4xsfa4ybvpaGSqZcBtI3ORsJeWP1dX365iEORXkpTtUYuWadMI jr89YWJ/mbHU/roJIqyK+mevZ2mkT9Ppk34Sen7PWbV4o3DPb99Zcgv2f0y2VWIpzkg01GIu Kk4EACWeDTgpAgAA X-CMS-MailID: 20170906103729eucas1p1ea88d3ce8fc8d7c07f71fcdc12a5d4d0 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 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: 20170906103729eucas1p1ea88d3ce8fc8d7c07f71fcdc12a5d4d0 X-RootMTR: 20170906103729eucas1p1ea88d3ce8fc8d7c07f71fcdc12a5d4d0 References: <1504694220-15818-1-git-send-email-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 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 ae89e53..a87f60b 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); }