From patchwork Thu Nov 13 16:37:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 5299181 Return-Path: X-Original-To: patchwork-dri-devel@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 4F19FC11AD for ; Thu, 13 Nov 2014 16:38:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8CEE42021F for ; Thu, 13 Nov 2014 16:38:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A08E020219 for ; Thu, 13 Nov 2014 16:38:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 866BE6E40C; Thu, 13 Nov 2014 08:38:13 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout4.w1.samsung.com (mailout4.w1.samsung.com [210.118.77.14]) by gabe.freedesktop.org (Postfix) with ESMTP id 3167B6E37C for ; Thu, 13 Nov 2014 08:38:12 -0800 (PST) Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NEZ00M6VL076Q90@mailout4.w1.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 13 Nov 2014 16:40:55 +0000 (GMT) X-AuditID: cbfec7f4-b7f6c6d00000120b-06-5464de72fc9f Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 01.58.04619.27ED4645; Thu, 13 Nov 2014 16:38:10 +0000 (GMT) Received: from AMDC1061.digital.local ([106.116.147.88]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NEZ00FSHKV93H60@eusync2.samsung.com>; Thu, 13 Nov 2014 16:38:10 +0000 (GMT) From: Andrzej Hajda To: Inki Dae Subject: [PATCH 3/7] drm/exynos/mixer: correct vsync configuration sequence Date: Thu, 13 Nov 2014 17:37:44 +0100 Message-id: <1415896668-27226-4-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1415896668-27226-1-git-send-email-a.hajda@samsung.com> References: <1415896668-27226-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHJMWRmVeSWpSXmKPExsVy+t/xK7pF91JCDJbv4rW4te4cq8WVr+/Z LCbdn8Bi8eLeRRaLtUfusjuwetzvPs7k0bdlFWMAUxSXTUpqTmZZapG+XQJXxt1z8gWnuSs2 PV/J2MD4jbOLkZNDQsBE4sbl44wQtpjEhXvr2boYuTiEBJYySsxtPgjl9DFJPLu9hAmkik1A U+Lv5ptsILaIgLLEqn3t7CBFzAKLGSUeNNxiBUkIC3hLbNz+AayBRUBV4t3sNjCbV8BZ4sum j2wQ6+QkTh6bDFbPKeAi0btoMTOILQRU837aetYJjLwLGBlWMYqmliYXFCel5xrqFSfmFpfm pesl5+duYoSEyZcdjIuPWR1iFOBgVOLh/cCdEiLEmlhWXJl7iFGCg1lJhNf7MFCINyWxsiq1 KD++qDQntfgQIxMHp1QDY8v0t4siku6n7JRq2Xzt+Y6i9MJG5xQn24emOzaavZ6zx/Tr+YUu ayJ1axmSp5YYz/j/rOCg7tPF649tyVq2+N/ftONntr7j8eDSfzCd23OKGqO5fHCBZeQeJl+d ihmZ3gfKnCM/8mu7SZ3XaEnrbRC7Kbn1yM6eMMETpzuSlt3Z/Xst8x37+0osxRmJhlrMRcWJ ADO89KzxAQAA Cc: Andrzej Hajda , dri-devel@lists.freedesktop.org, Marek Szyprowski X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Specification advises to clear vsync indicator before configuring vsync. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos_mixer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 52275b4..2df1bb2 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -900,8 +900,8 @@ static int mixer_enable_vblank(struct exynos_drm_manager *mgr) } /* enable vsync interrupt */ - mixer_reg_writemask(res, MXR_INT_EN, MXR_INT_EN_VSYNC, - MXR_INT_EN_VSYNC); + mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC); + mixer_reg_writemask(res, MXR_INT_EN, ~0, MXR_INT_EN_VSYNC); return 0; } @@ -912,6 +912,7 @@ static void mixer_disable_vblank(struct exynos_drm_manager *mgr) struct mixer_resources *res = &mixer_ctx->mixer_res; /* disable vsync interrupt */ + mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC); mixer_reg_writemask(res, MXR_INT_EN, 0, MXR_INT_EN_VSYNC); } @@ -1101,6 +1102,8 @@ static void mixer_poweron(struct exynos_drm_manager *mgr) mixer_reg_writemask(res, MXR_STATUS, ~0, MXR_STATUS_SOFT_RESET); + if (ctx->int_en & MXR_INT_EN_VSYNC) + mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC); mixer_reg_write(res, MXR_INT_EN, ctx->int_en); mixer_win_reset(ctx);