From patchwork Fri Sep 29 10:05:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9977403 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 2262660329 for ; Fri, 29 Sep 2017 10:05:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C7CF29805 for ; Fri, 29 Sep 2017 10:05:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1117C2980D; Fri, 29 Sep 2017 10:05:53 +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 2845829805 for ; Fri, 29 Sep 2017 10:05:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752003AbdI2KFv (ORCPT ); Fri, 29 Sep 2017 06:05:51 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:42633 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922AbdI2KFt (ORCPT ); Fri, 29 Sep 2017 06:05:49 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20170929100547euoutp027deb0517d50ce91b186898b82dbce8d3~ozRDcZL5b0286302863euoutp02h; Fri, 29 Sep 2017 10:05:47 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170929100546eucas1p2a32d6508a99f2320427b004cb3d4b940~ozRCjrjK91409714097eucas1p26; Fri, 29 Sep 2017 10:05:46 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3.samsung.com (EUCPMTA) with SMTP id EA.CA.12867.AFA1EC95; Fri, 29 Sep 2017 11:05:46 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170929100546eucas1p2c06bf97d6961259c617b1e6d3a63f081~ozRB_UEZq1408714087eucas1p2F; Fri, 29 Sep 2017 10:05:46 +0000 (GMT) X-AuditID: cbfec7f2-f793b6d000003243-b6-59ce1afad439 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id E9.A8.20118.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 01/11] drm/exynos/mixer: abstract out output mode setup code Date: Fri, 29 Sep 2017 12:05:32 +0200 Message-id: <20170929100542.12849-2-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+NgFjrMIsWRmVeSWpSXmKPExsWy7djPc7q/pM5FGry4I21xa905VouNM9az Wjya/5jZ4srX92wWk+5PYLGYcX4fk8XaI3fZLdpWf2B14PBY9D3L4373cSaPf8fYPfq2rGL0 +LxJLoA1issmJTUnsyy1SN8ugSvj8dlLTAWHxCt6dl9ga2D8KdzFyMkhIWAiseTxOlYIW0zi wr31bF2MXBxCAksZJTY+/wDlfGaU+P7rPAtMR9PeF2C2kMAyRol3T2Uhiv4zSvyd84kRJMEm oCnxd/NNNhBbREBZYtW+dnaQImaBZUwSB27uAtsnLBAo0b3pMTuIzSKgKvHj5lewOK+AhcTP ZevYILbJS5x7cJsZxOYUsJRYPPkLE8ggCYEZbBLzr99ihChykbiwcy8zhC0s8er4FnYIW0bi 8uRuFoiGbkaJT/0n2CGcKYwS/z7MgOqwljh8/CLYamYBPolJ26YDxTmA4rwSHW1CECUeEk0f FkItc5ToPr+YBeLnHkaJy6tOMU5glF7AyLCKUSS1tDg3PbXYWK84Mbe4NC9dLzk/dxMjMGpP /zv+aQfj1xNWhxgFOBiVeHhvyJ2NFGJNLCuuzD3EKMHBrCTC+4TzXKQQb0piZVVqUX58UWlO avEhRmkOFiVxXtuotkghgfTEktTs1NSC1CKYLBMHp1QD43zD/5dKsx1PrrVrXrz2g39gdQSv pOld9RuubDf3mrGe575XsepovH9MZK7AR6cZO8sNljEohiUImF96WDcvUeamXSr/IdV73ff8 3txY7fmK+yP/bMeZrBY71u15cPjqw2OdL5/85/ZoWyL+nnW6t8G/bUUzjWXXTvod6RRjYrba njNljXqIlBJLcUaioRZzUXEiACbu/cjWAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprOLMWRmVeSWpSXmKPExsVy+t/xa7q/pM5FGnw6xGxxa905VouNM9az Wjya/5jZ4srX92wWk+5PYLGYcX4fk8XaI3fZLdpWf2B14PBY9D3L4373cSaPf8fYPfq2rGL0 +LxJLoA1issmJTUnsyy1SN8ugSvj8dlLTAWHxCt6dl9ga2D8KdzFyMkhIWAi0bT3BQuELSZx 4d56ti5GLg4hgSWMEg+PXWeFcBqZJG52PmIHqWIT0JT4u/kmG4gtIqAssWpfOztIEbPAKiaJ WW29YAlhAX+Jk2t3soLYLAKqEj9ufgWzeQUsJH4uW8cGsU5e4tyD28wgNqeApcTiyV+YQGwh oJpFC9ezTmDkXcDIsIpRJLW0ODc9t9hIrzgxt7g0L10vOT93EyMwuLYd+7llB2PXu+BDjAIc jEo8vDfkzkYKsSaWFVfmHmKU4GBWEuF9wnkuUog3JbGyKrUoP76oNCe1+BCjNAeLkjhv757V kUIC6YklqdmpqQWpRTBZJg5OqQbGWCXToCtmD74xvlCynbfi4ObrwXdrZu1iOzLdTVYgePF8 m7T8O3Ms+WImfGZdtfiunaRVll//hEVvPcRvS11gMOd/Xjxnx2+n3dqisy6e8++5fr7HrvCQ 3/qdGy99/OB9pMLIultJT/6o1bPf5tEV5y2+Fu2bp3/iCqO0ukhh/NNHEjPuV7fqKbEUZyQa ajEXFScCADzPeyMqAgAA X-CMS-MailID: 20170929100546eucas1p2c06bf97d6961259c617b1e6d3a63f081 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: 20170929100546eucas1p2c06bf97d6961259c617b1e6d3a63f081 X-RootMTR: 20170929100546eucas1p2c06bf97d6961259c617b1e6d3a63f081 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 Mode setup code is called from video plane update and mixer plane update. Let's group it together in mixer_commit function like in case of other Exynos CRTCs. Signed-off-by: Andrzej Hajda Reviewed-by: Tobias Jakobi --- drivers/gpu/drm/exynos/exynos_mixer.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 002755415e00..499ebdca4fed 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -473,6 +473,22 @@ static void mixer_stop(struct mixer_context *ctx) usleep_range(10000, 12000); } +static void mixer_commit(struct mixer_context *ctx) +{ + struct drm_display_mode *mode = &ctx->crtc->base.state->adjusted_mode; + + /* 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_rgb_fmt(ctx, mode->vdisplay); + mixer_run(ctx); +} + static void vp_video_buffer(struct mixer_context *ctx, struct exynos_drm_plane *plane) { @@ -553,11 +569,9 @@ static void vp_video_buffer(struct mixer_context *ctx, vp_reg_write(res, VP_TOP_C_PTR, chroma_addr[0]); vp_reg_write(res, VP_BOT_C_PTR, chroma_addr[1]); - mixer_cfg_scan(ctx, mode->vdisplay); - mixer_cfg_rgb_fmt(ctx, mode->vdisplay); mixer_cfg_layer(ctx, plane->index, priority, true); mixer_cfg_vp_blend(ctx); - mixer_run(ctx); + mixer_commit(ctx); spin_unlock_irqrestore(&res->reg_slock, flags); @@ -638,14 +652,6 @@ static void mixer_graph_buffer(struct mixer_context *ctx, mixer_reg_write(res, MXR_GRAPHIC_SPAN(win), fb->pitches[0] / fb->format->cpp[0]); - /* setup display size */ - if (ctx->mxr_ver == MXR_VER_128_0_0_184 && - win == DEFAULT_WIN) { - val = MXR_MXR_RES_HEIGHT(mode->vdisplay); - val |= MXR_MXR_RES_WIDTH(mode->hdisplay); - mixer_reg_write(res, MXR_RESOLUTION, val); - } - val = MXR_GRP_WH_WIDTH(state->src.w); val |= MXR_GRP_WH_HEIGHT(state->src.h); val |= MXR_GRP_WH_H_SCALE(x_ratio); @@ -660,18 +666,15 @@ static void mixer_graph_buffer(struct mixer_context *ctx, /* set buffer address to mixer */ mixer_reg_write(res, MXR_GRAPHIC_BASE(win), dma_addr); - mixer_cfg_scan(ctx, mode->vdisplay); - mixer_cfg_rgb_fmt(ctx, mode->vdisplay); mixer_cfg_layer(ctx, win, priority, true); mixer_cfg_gfx_blend(ctx, win, is_alpha_format(fb->format->format)); + mixer_commit(ctx); /* layer update mandatory for mixer 16.0.33.0 */ if (ctx->mxr_ver == MXR_VER_16_0_33_0 || ctx->mxr_ver == MXR_VER_128_0_0_184) mixer_layer_update(ctx); - mixer_run(ctx); - spin_unlock_irqrestore(&res->reg_slock, flags); mixer_regs_dump(ctx);