From patchwork Wed Mar 8 14:58:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9611419 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 1EFCF60414 for ; Wed, 8 Mar 2017 15:13:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB14427C2D for ; Wed, 8 Mar 2017 15:13:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFF8D285C4; Wed, 8 Mar 2017 15:13:17 +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 47D9027DA4 for ; Wed, 8 Mar 2017 15:13:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750770AbdCHPNR (ORCPT ); Wed, 8 Mar 2017 10:13:17 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:63853 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751079AbdCHPMo (ORCPT ); Wed, 8 Mar 2017 10:12:44 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OMI0060R4AHLFA0@mailout2.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 08 Mar 2017 14:59:05 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170308145904eucas1p19fa824addaf06138955bebc7326c1566~p8BmefdaE1923519235eucas1p1a; Wed, 8 Mar 2017 14:59:04 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 9D.F7.09557.83C10C85; Wed, 8 Mar 2017 14:59:04 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170308145903eucas1p2a64c7cd562dfddf43dbbe5dd9281edc6~p8BlyQD7a0049700497eucas1p2P; Wed, 8 Mar 2017 14:59:03 +0000 (GMT) X-AuditID: cbfec7f2-f790f6d000002555-a5-58c01c382d53 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 21.C7.10233.24C10C85; Wed, 8 Mar 2017 14:59:14 +0000 (GMT) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OMI0059P4AC5T30@eusync3.samsung.com>; Wed, 08 Mar 2017 14:59:03 +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 v2 07/12] drm/exynos/decon5433: fix software trigger mask Date: Wed, 08 Mar 2017 15:58:41 +0100 Message-id: <1488985126-25288-8-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1488985126-25288-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrAIsWRmVeSWpSXmKPExsWy7djP87oWMgciDJ5NkbC4te4cq8XGGetZ La58fc9mMen+BBaLN2/XMFmcP7+B3WLG+X1MFmuP3GV34PDYtKqTzeN+93Emjy39d9k9+ras YvT4vEkugDWKyyYlNSezLLVI3y6BK2PmtUnMBTM5Ki5dncPcwPiNrYuRk0NCwERizaGd7BC2 mMSFe+uB4lwcQgJLGSX+TZrDAuF8ZpT4f/EgI0zHgQ/voaqWMUps+jcNyvnPKLFmznWwuWwC mhJ/N98Es0UElCVW7WtnByliFtjAJHFz9nOwUcICnhKb2m+D2SwCqhIrz95kBrF5BZwl3s96 wwSxTk7i5rlOsDingItE38fJzCCDJAS+s0kc3XkIyOEAcmQlNh1ghqh3kbiy8TYrhC0s8er4 FqjnZCQuT+5mgejtZpT41H+CHcKZAvTphxlQ3dYSh49fBOtmFuCTmLRtOtQCXomONiEI00Pi 2BsWiGpHiRn7pzJCfD+dUaJvYjvbBEaZBYwMqxhFUkuLc9NTi431ihNzi0vz0vWS83M3MQLj +fS/4592MH49YXWIUYCDUYmHV0D4QIQQa2JZcWXuIUYJDmYlEd4LX/dHCPGmJFZWpRblxxeV 5qQWH2KU5mBREufds+BKuJBAemJJanZqakFqEUyWiYNTqoFxpex3pcpjCn8CNW7Vb4953fO4 T//e3mu+tqeu+pgrP3FsYCpZpvffrlHWR2PlrZwZPOJB06c28zNHlZ2d+XmRYOHxw0r3/32/ 2bqpqT6Jn/vHz79FChEMyde65A40xJzp/Nvu+lZTequwXbPNEtufOXqc54qqrdcaiAVd9ZMR +RB6MoNX6K0SS3FGoqEWc1FxIgCaJstP4wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRmVeSWpSXmKPExsVy+t/xq7pOMgciDNrXqFrcWneO1WLjjPWs Fle+vmezmHR/AovFm7drmCzOn9/AbjHj/D4mi7VH7rI7cHhsWtXJ5nG/+ziTx5b+u+wefVtW MXp83iQXwBrlZpORmpiSWqSQmpecn5KZl26rFBripmuhpJCXmJtqqxSh6xsSpKRQlphTCuQZ GaABB+cA92AlfbsEt4yZ1yYxF8zkqLh0dQ5zA+M3ti5GTg4JAROJAx/eQ9liEhfurQeyuTiE BJYwStzffY8Vwmlkkljw/wcLSBWbgKbE3803wTpEBJQlVu1rZwcpYhbYwCRxt+8kK0hCWMBT YlP7bUYQm0VAVWLl2ZvMIDavgLPE+1lvmCDWyUncPNcJFucUcJHo+zgZyOYA2uYssbRfZwIj 7wJGhlWMIqmlxbnpucVGesWJucWleel6yfm5mxiBYb3t2M8tOxi73gUfYhTgYFTi4d0hcCBC iDWxrLgy9xCjBAezkgjvha/7I4R4UxIrq1KL8uOLSnNSiw8xmgLdNJFZSjQ5HxhzeSXxhiaG 5paGRsYWFuZGRkrivFM/XAkXEkhPLEnNTk0tSC2C6WPi4JRqYAzVsv3Zq1r/9c6tLyX/UqXv hxVWHti66N3HFXM9u8yazEzK3c4p7dmftP7DwaZHAfsna8gWKk/13qM1VXXVFmm10Lazfhz/ rkw/35HFUh3L0nt5kgHzzv/hGt8KazqrLvOLp/0u+PYhtnjuhIldG7e/FDCzVw2dlsmm37+t IqAx+dc9AbaZTEosxRmJhlrMRcWJAIbYwACBAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170308145903eucas1p2a64c7cd562dfddf43dbbe5dd9281edc6 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: 20170308145903eucas1p2a64c7cd562dfddf43dbbe5dd9281edc6 X-RootMTR: 20170308145903eucas1p2a64c7cd562dfddf43dbbe5dd9281edc6 References: <1488985126-25288-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 319f557..ee8d5cb 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -182,8 +182,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; }