From patchwork Tue Mar 14 08:28:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9622729 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 4E55060424 for ; Tue, 14 Mar 2017 08:28:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C0222837F for ; Tue, 14 Mar 2017 08:28:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30E5E284DC; Tue, 14 Mar 2017 08:28:22 +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 5224C2837F for ; Tue, 14 Mar 2017 08:28:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750850AbdCNI2U (ORCPT ); Tue, 14 Mar 2017 04:28:20 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:59659 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751017AbdCNI2Q (ORCPT ); Tue, 14 Mar 2017 04:28:16 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OMS00DYUQ71SS50@mailout1.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 14 Mar 2017 08:28:14 +0000 (GMT) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170314082813eucas1p1cd2802c77736bfeca4c1886cf7eb0455~rskDjG4ac2693226932eucas1p1x; Tue, 14 Mar 2017 08:28:13 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges4.samsung.com (EUCPMTA) with SMTP id 7E.45.28517.D99A7C85; Tue, 14 Mar 2017 08:28:13 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170314082812eucas1p2c56602a1f88814a4b0f5e4a7ee74b6ed~rskC2nBbl3193031930eucas1p2l; Tue, 14 Mar 2017 08:28:12 +0000 (GMT) X-AuditID: cbfec7f4-f79716d000006f65-26-58c7a99df81d Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 18.B9.10233.9A9A7C85; Tue, 14 Mar 2017 08:28:25 +0000 (GMT) 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 <0OMS00G2GQ6XHC40@eusync1.samsung.com>; Tue, 14 Mar 2017 08:28:12 +0000 (GMT) From: Andrzej Hajda To: Inki Dae Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, Krzysztof Kozlowski , Javier Martinez Canillas Subject: [PATCH 5/5] drm/exynos/decon5433: fix software trigger mask Date: Tue, 14 Mar 2017 09:28:00 +0100 Message-id: <1489480080-25633-6-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1489480080-25633-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLIsWRmVeSWpSXmKPExsWy7djP87pzVx6PMLg4UdDi1rpzrBYbZ6xn tbjy9T2bxaT7E1gs3rxdw2Rx/vwGdosZ5/cxWaw9cpfdgcNj06pONo/73ceZPLb032X36Nuy itHj8ya5ANYoLpuU1JzMstQifbsErozVsxexF8zkqPj+4yxrA+M3ti5GTg4JAROJWSu2s0LY YhIX7q0HiwsJLGWUmLs7uouRC8j+zCix+9Yi5i5GDrCGk+vEIeLLGCUuti9lhHD+M0q8urGL EaSbTUBT4u/mm2CTRASUJVbta2cHKWIW2MAkcXP2c7AiYQEXidttDcwgNouAqsTdk1sYQTbw CjhLrF2cBXGRnMTNc51gizmByv+cVgAZIyHwm03i3PS1rBAHyUpsOsAMUe4icfbPWiYIW1ji 1fEt7BC2jMTlyd0sEL3djBKf+k+wQzhTGCX+fZgB1W0tcfj4RXBQMAvwSUzaNh3qY16JjjYh iBIPiWkzT0ANdZTYe+QRE8Tz0xklFn67xTyBUWYBI8MqRpHU0uLc9NRiE73ixNzi0rx0veT8 3E2MwEg+/e/4lx2Mi49ZHWIU4GBU4uFtmHMsQog1say4MvcQowQHs5II77am4xFCvCmJlVWp RfnxRaU5qcWHGKU5WJTEefcsuBIuJJCeWJKanZpakFoEk2Xi4JRqYJTqmcET+2H7/4mS8VLS d9tSo2UTriwzfZQlMlGe/duVfzeNZQI4N7+o8nuvzfunrNRs1cytt2avf/noddv7Mxe315cz 126Oq710I/fS3GeeM/1FbjF03hTmPf6zTlKkZtPy15tm5/mv/Osz78nTdWEbbnubOqpPPeAT PM3pbsBriyats+5atWlKLMUZiYZazEXFiQAk3pcD4AIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRmVeSWpSXmKPExsVy+t/xy7orVx6PMHi9VMTi1rpzrBYbZ6xn tbjy9T2bxaT7E1gs3rxdw2Rx/vwGdosZ5/cxWaw9cpfdgcNj06pONo/73ceZPLb032X36Nuy itHj8ya5ANYoN5uM1MSU1CKF1Lzk/JTMvHRbpdAQN10LJYW8xNxUW6UIXd+QICWFssScUiDP yAANODgHuAcr6dsluGWsnr2IvWAmR8X3H2dZGxi/sXUxcnBICJhInFwn3sXICWSKSVy4tx4o zMUhJLCEUWJpy2FWCKeRSWJlTxc7SBWbgKbE38032UBsEQFliVX72tlBipgFNjBJ3O07yQqS EBZwkbjd1sAMYrMIqErcPbmFEWQbr4CzxNrFWRDb5CRunutkBglzApX/Oa0AEhYCqth3azLb BEbeBYwMqxhFUkuLc9Nzi430ihNzi0vz0vWS83M3MQJDetuxn1t2MHa9Cz7EKMDBqMTD2zDn WIQQa2JZcWXuIUYJDmYlEd5tTccjhHhTEiurUovy44tKc1KLDzGaAp00kVlKNDkfGG95JfGG JobmloZGxhYW5kZGSuK8Uz9cCRcSSE8sSc1OTS1ILYLpY+LglGpg3KRy/IJme1v2YqZTiVOF v4g3ZMv2l8Yr9K7Sej7BPodjSo3A43aHYL+OyR/52/q+GsgYnZpuIbV1j7ejJcsuY43Jrm/l TSyva+56e0zUeWfQtWV8E/jO681sORypnXXhpmOTWdTmmtqQMy4r3hS+OrmgTOXqWqsNO6PO vP38au3WCiatiqheJZbijERDLeai4kQAk/N0jn8CAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170314082812eucas1p2c56602a1f88814a4b0f5e4a7ee74b6ed 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-HopCount: 7 X-CMS-RootMailID: 20170314082812eucas1p2c56602a1f88814a4b0f5e4a7ee74b6ed X-RootMTR: 20170314082812eucas1p2c56602a1f88814a4b0f5e4a7ee74b6ed References: <1489480080-25633-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 The patch fixes copy/paste bug introduced during code refactoring. Reported-by: Dan Carpenter Fixes: b93c2e8b5d9d ("drm/exynos/decon5433: configure sysreg in case of hardware trigger")Fixes: Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index a43d0fa..c0e8d33 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -172,8 +172,8 @@ static void decon_setup_trigger(struct decon_context *ctx) return; if (!(ctx->out_type & I80_HW_TRG)) { - writel(TRIGCON_TE_AUTO_MASK | TRIGCON_SWTRIGEN - | TRIGCON_TE_AUTO_MASK | TRIGCON_SWTRIGEN, + writel(TRIGCON_TRIGEN_PER_F | TRIGCON_TRIGEN_F | + TRIGCON_TE_AUTO_MASK | TRIGCON_SWTRIGEN, ctx->addr + DECON_TRIGCON); return; }