From patchwork Mon Nov 17 13:00:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: YoungJun Cho X-Patchwork-Id: 5318701 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4D306C11AC for ; Mon, 17 Nov 2014 13:00:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 167852015E for ; Mon, 17 Nov 2014 13:00:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13E6B20160 for ; Mon, 17 Nov 2014 13:00:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751580AbaKQNA0 (ORCPT ); Mon, 17 Nov 2014 08:00:26 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:35157 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492AbaKQNAZ (ORCPT ); Mon, 17 Nov 2014 08:00:25 -0500 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NF6003NEPGK4B10@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 17 Nov 2014 22:00:20 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.42]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 07.F0.18484.461F9645; Mon, 17 Nov 2014 22:00:20 +0900 (KST) X-AuditID: cbfee68f-f791c6d000004834-bb-5469f164f1ff Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 52.A8.09430.461F9645; Mon, 17 Nov 2014 22:00:20 +0900 (KST) Received: from localhost.localdomain ([10.252.75.90]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NF60048CPGGHM50@mmp2.samsung.com>; Mon, 17 Nov 2014 22:00:20 +0900 (KST) From: YoungJun Cho To: dri-devel@lists.freedesktop.org Cc: linux-samsung-soc@vger.kernel.org, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, a.hajda@samsung.com, kyungmin.park@samsung.com Subject: [PATCH 3/9] drm/exynos: fimd: add fimd_enable_video_output() to cleanup Date: Mon, 17 Nov 2014 22:00:10 +0900 Message-id: <1416229216-32018-4-git-send-email-yj44.cho@samsung.com> X-Mailer: git-send-email 1.9.0 In-reply-to: <1416229216-32018-1-git-send-email-yj44.cho@samsung.com> References: <1416229216-32018-1-git-send-email-yj44.cho@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t8zLd2Uj5khBvdvGFjcWneO1eLK1/ds FpPuT2CxeHHvIovF2aY37BYzzu9jspgx+SWbA7vH/e7jTB59W1YxenzeJBfAHMVlk5Kak1mW WqRvl8CVcWz9e6aCaUIVr3tesDUwNvJ3MXJySAiYSJx9+YYVwhaTuHBvPVsXIxeHkMAyRolH R3YywhR92nUOzBYSmM4ocXBXKURRK5PEu/e9bCAJNgFNiecfd4BNEhFQlvg7cRVYA7PAAkaJ qzc4QGxhgQCJ1xO/gdWwCKhK9Px5zAxi8wq4SJxseg11hZzElN8L2EFsTgFXiTeze6AWu0gs +XaSEWSxhEA7u8T+CW1QgwQkvk0+xNLFyAGUkJXYdIAZYo6kxMEVN1gmMAovYGRYxSiaWpBc UJyUXmSsV5yYW1yal66XnJ+7iRES0v07GO8esD7EKMDBqMTDuyM7M0SINbGsuDL3EKMp0IaJ zFKiyfnAyMkriTc0NjOyMDUxNTYytzRTEuddKPUzWEggPbEkNTs1tSC1KL6oNCe1+BAjEwen VAOjnZPE/JUztlW/kVvw65Xfn9lHwipnSAlOL1c9YSvfaO+Vv8v/z6rwiYfO7bwye1ubtYXZ ph/SJ6L3LVnx9XB9PP+qZ5lxGtn7FNum+yy7Yv3w5DnTecvSg+uWyKSZ8G2tEOmWl7v04OMD JdPNn155LMh5OevojPAGnkmvVRZwp/jwJFrezF1vqsRSnJFoqMVcVJwIAAWvboxkAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRmVeSWpSXmKPExsVy+t9jQd2Uj5khBgdWaFvcWneO1eLK1/ds FpPuT2CxeHHvIovF2aY37BYzzu9jspgx+SWbA7vH/e7jTB59W1YxenzeJBfAHNXAaJORmpiS WqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtF1JoSwxpxQoFJBY XKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjHmHFs/XumgmlCFa97XrA1MDbydzFyckgImEh8 2nWOEcIWk7hwbz0biC0kMJ1R4uCu0i5GLiC7lUni3ftesASbgKbE8487WEFsEQFlib8TV4E1 MwssYJS4eoMDxBYWCJB4PfEbWA2LgKpEz5/HzCA2r4CLxMmm16wQy+QkpvxewA5icwq4SryZ 3cMIsdhFYsm3k4wTGHkXMDKsYhRNLUguKE5KzzXSK07MLS7NS9dLzs/dxAiOmGfSOxhXNVgc YhTgYFTi4d2RnRkixJpYVlyZe4hRgoNZSYQ35iJQiDclsbIqtSg/vqg0J7X4EKMp0FUTmaVE k/OB0ZxXEm9obGJmZGlkZmxibmysJM57sNU6UEggPbEkNTs1tSC1CKaPiYNTChiVdyayr/g1 XTrscG3t/0t/jBdGG9t5f2E4V+t9clJv+vxo6x32nJlTthRlTyiQn2smfO5KLtuUC+sE2Ddz sJ9Iqv89+YbbSoNb0pHFvy8FMz399jrs+NaMreosWbXLm4wiE2478s+X2B5lqLzmUtbLOqac NC5GTYGjx5Mz1kxiluXbtTr10gYlluKMREMt5qLiRADGYI5+rgIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This bit is used for video output and logic signal control. So it is better for readability. Signed-off-by: YoungJun Cho Acked-by: Inki Dae Acked-by: Kyungmin Park --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 77ba961..5cfd251 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -229,6 +229,19 @@ static void fimd_wait_for_vblank(struct exynos_drm_manager *mgr) DRM_DEBUG_KMS("vblank wait timed out.\n"); } +static void fimd_enable_video_output(struct fimd_context *ctx, int win, + bool enable) +{ + u32 val = readl(ctx->regs + WINCON(win)); + + if (enable) + val |= WINCONx_ENWIN; + else + val &= ~WINCONx_ENWIN; + + writel(val, ctx->regs + WINCON(win)); +} + static void fimd_clear_channel(struct exynos_drm_manager *mgr) { struct fimd_context *ctx = mgr->ctx; @@ -241,9 +254,7 @@ static void fimd_clear_channel(struct exynos_drm_manager *mgr) u32 val = readl(ctx->regs + WINCON(win)); if (val & WINCONx_ENWIN) { - /* wincon */ - val &= ~WINCONx_ENWIN; - writel(val, ctx->regs + WINCON(win)); + fimd_enable_video_output(ctx, win, false); /* unprotect windows */ if (ctx->driver_data->has_shadowcon) { @@ -746,10 +757,7 @@ static void fimd_win_commit(struct exynos_drm_manager *mgr, int zpos) if (win != 0) fimd_win_set_colkey(ctx, win); - /* wincon */ - val = readl(ctx->regs + WINCON(win)); - val |= WINCONx_ENWIN; - writel(val, ctx->regs + WINCON(win)); + fimd_enable_video_output(ctx, win, true); if (ctx->driver_data->has_shadowcon) { val = readl(ctx->regs + SHADOWCON); @@ -790,10 +798,7 @@ static void fimd_win_disable(struct exynos_drm_manager *mgr, int zpos) /* protect windows */ fimd_shadow_protect_win(ctx, win, true); - /* wincon */ - val = readl(ctx->regs + WINCON(win)); - val &= ~WINCONx_ENWIN; - writel(val, ctx->regs + WINCON(win)); + fimd_enable_video_output(ctx, win, false); /* unprotect windows */ if (ctx->driver_data->has_shadowcon) {