From patchwork Mon Dec 10 11:18:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10721107 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 0FCBE15A6 for ; Mon, 10 Dec 2018 11:18:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F83529608 for ; Mon, 10 Dec 2018 11:18:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 138152961E; Mon, 10 Dec 2018 11:18:46 +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=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 BD14729608 for ; Mon, 10 Dec 2018 11:18:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DD3E6EAA0; Mon, 10 Dec 2018 11:18:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id F237A6E3E0 for ; Mon, 10 Dec 2018 11:18:40 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20181210111839euoutp01af2f25a3a2d12feebdc5e203bb6fa6e6~u9KbnRPT33018530185euoutp01U; Mon, 10 Dec 2018 11:18:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20181210111839euoutp01af2f25a3a2d12feebdc5e203bb6fa6e6~u9KbnRPT33018530185euoutp01U Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181210111839eucas1p29ad18b143113d54b49e6546e6b0ed04a~u9KbIRnT40965409654eucas1p2o; Mon, 10 Dec 2018 11:18:39 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 52.4A.04806.F8B4E0C5; Mon, 10 Dec 2018 11:18:39 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181210111838eucas1p2eaf5aa4bfa73efa0b22a609aa0837ea2~u9KaZve7u0965309653eucas1p2m; Mon, 10 Dec 2018 11:18:38 +0000 (GMT) X-AuditID: cbfec7f5-367ff700000012c6-91-5c0e4b8f8a4b Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 5E.9E.04284.E8B4E0C5; Mon, 10 Dec 2018 11:18:38 +0000 (GMT) Received: from AMDC3748.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 <0PJI001ZCQ31VQ20@eusync4.samsung.com>; Mon, 10 Dec 2018 11:18:38 +0000 (GMT) From: Andrzej Hajda To: Inki Dae Subject: [PATCH v2 2/3] drm/exynos/fimd: create local helper for disabling hardware window Date: Mon, 10 Dec 2018 12:18:33 +0100 Message-id: <20181210111834.17916-3-a.hajda@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20181210111834.17916-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprBIsWRmVeSWpSXmKPExsWy7djP87r93nwxBo9aOCxurTvHarFxxnpW iytf37NZTLo/gcVixvl9TBZrj9xld2DzuN99nMmjb8sqRo/Pm+QCmKO4bFJSczLLUov07RK4 MvZdnsdYsEmwomf3BbYGxq18XYycHBICJhLn7z1g7GLk4hASWMEocfXkJSjnM6PEouU7mWCq 7p17ywaRWMYo8WPbNCCHA8j5zyjRmQVSwyagKfF38002EFtEQFli1b52dpB6ZoFLjBKvT3Yz gtQLC8RIfF7gCVLDIqAq8WfVc0YQm1fAQmLx2Q0sELvkJVZvOMAMUs4pYCnR8jgPZIyEwFtW iRkXTrJB1LhIvFx8jhXCFpZ4dXwLO4QtI9HZcRDq5nqJpplXmCGaOxglTixeDtVsLXH4+EWw ZmYBPolJ26aDLZMQ4JXoaBOCKPGQuPq/ixXi3x5GiYc959kmMEouYGRYxSieWlqcm55abJyX Wq5XnJhbXJqXrpecn7uJERhfp/8d/7qDcd+fpEOMAhyMSjy8AU28MUKsiWXFlbmHGCU4mJVE eHXTgEK8KYmVValF+fFFpTmpxYcYpTlYlMR5qxkeRAsJpCeWpGanphakFsFkmTg4pRoYa7X9 JuwzyeNfeWtKx7Te+z4zrdd93f86Tor1mvqjU7ELJL9N4Sj/l/5jzYVJ2azBwaeW5LbFHvt3 3DyU68+uI3wrtjMFO35mXRo2cWlPbdi9B2VP+NJ5Kzg+8ys3HVXbJMS3Mf8zV6fSYxvhr9+0 EiaYRUsF3nByPauRlM15f+L/7Bkr4nY/UmIpzkg01GIuKk4EAJuJo6erAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrGJMWRmVeSWpSXmKPExsVy+t/xa7p93nwxBjevqVjcWneO1WLjjPWs Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw Zey7PI+xYJNgRc/uC2wNjFv5uhg5OSQETCTunXvL1sXIxSEksIRRYu+SOewQTiOTxPcju9hB qtgENCX+br7JBmKLCChLrNrXDlbELHCFUaL9WxeQw8EhLBAj8XmBJ0gNi4CqxJ9VzxlBbF4B C4nFZzewQGyTl1i94QAzSDmngKVEy+M8EFMIqGTagdwJjDwLGBlWMYqklhbnpucWG+oVJ+YW l+al6yXn525iBIbGtmM/N+9gvLQx+BCjAAejEg9vQBNvjBBrYllxZe4hRgkOZiURXt00oBBv SmJlVWpRfnxRaU5q8SFGaQ4WJXHe8waVUUIC6YklqdmpqQWpRTBZJg5OqQbGWZcXx+huW1x2 J9OCze6Ez6vtO7pa2OOzJfOrHpw5MOuGmsfrCoP1h3yE9nR8kH8z76GcaltF58E1pR2P1bmE nKqab3tu4yl5UVhtn2//U4rhbKtQV0VcV5vGMnXbhTUtT+rZrB1vVc86cJpPld1StGdTrPPy j26/TF64MMy7tuv1s9DCf4xKLMUZiYZazEXFiQBHt2WECQIAAA== X-CMS-MailID: 20181210111838eucas1p2eaf5aa4bfa73efa0b22a609aa0837ea2 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181210111838eucas1p2eaf5aa4bfa73efa0b22a609aa0837ea2 References: <20181210111834.17916-1-a.hajda@samsung.com> 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: linux-samsung-soc@vger.kernel.org, Marek Szyprowski , dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hardware window disabling is performed in multiple places. Creating helper for it simplifies the code and prepares it for further improvements. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 786a8ee6f10f..a7993f5d8371 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -345,6 +345,14 @@ static void fimd_enable_shadow_channel_path(struct fimd_context *ctx, writel(val, ctx->regs + SHADOWCON); } +static void fimd_disable_win(struct fimd_context *ctx, int win) +{ + fimd_enable_video_output(ctx, win, false); + + if (ctx->driver_data->has_shadowcon) + fimd_enable_shadow_channel_path(ctx, win, false); +} + static void fimd_clear_channels(struct exynos_drm_crtc *crtc) { struct fimd_context *ctx = crtc->ctx; @@ -363,12 +371,7 @@ static void fimd_clear_channels(struct exynos_drm_crtc *crtc) u32 val = readl(ctx->regs + WINCON(win)); if (val & WINCONx_ENWIN) { - fimd_enable_video_output(ctx, win, false); - - if (ctx->driver_data->has_shadowcon) - fimd_enable_shadow_channel_path(ctx, win, - false); - + fimd_disable_win(ctx, win); ch_enabled = 1; } } @@ -880,15 +883,11 @@ static void fimd_disable_plane(struct exynos_drm_crtc *crtc, struct exynos_drm_plane *plane) { struct fimd_context *ctx = crtc->ctx; - unsigned int win = plane->index; if (ctx->suspended) return; - fimd_enable_video_output(ctx, win, false); - - if (ctx->driver_data->has_shadowcon) - fimd_enable_shadow_channel_path(ctx, win, false); + fimd_disable_win(ctx, plane->index); } static void fimd_enable(struct exynos_drm_crtc *crtc) @@ -923,7 +922,7 @@ static void fimd_disable(struct exynos_drm_crtc *crtc) * a destroyed buffer later. */ for (i = 0; i < WINDOWS_NR; i++) - fimd_disable_plane(crtc, &ctx->planes[i]); + fimd_disable_win(ctx, i); fimd_enable_vblank(crtc); fimd_wait_for_vblank(crtc);