From patchwork Tue Sep 27 13:36:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9351885 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 CCB336077B for ; Tue, 27 Sep 2016 13:36:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE99B28F6C for ; Tue, 27 Sep 2016 13:36:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B329928FB2; Tue, 27 Sep 2016 13:36:50 +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=-4.2 required=2.0 tests=BAYES_00, 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 656D728F6C for ; Tue, 27 Sep 2016 13:36:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B9FAF6E379; Tue, 27 Sep 2016 13:36:45 +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 DB7F46E6A7 for ; Tue, 27 Sep 2016 13:36:41 +0000 (UTC) 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 <0OE600MD40H3BL70@mailout1.w1.samsung.com> for dri-devel@lists.freedesktop.org; Tue, 27 Sep 2016 14:36:39 +0100 (BST) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20160927133638eucas1p2f0036dba15288254d11853af9f67b6c5~4MZYjwLcV1838418384eucas1p2v; Tue, 27 Sep 2016 13:36:38 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1.samsung.com (EUCPMTA) with SMTP id 53.6C.23383.7E57AE75; Tue, 27 Sep 2016 14:36:39 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20160927133638eucas1p166ffd9c015f30b48e93dc59f21b57781~4MZX8raAV2083320833eucas1p1T; Tue, 27 Sep 2016 13:36:38 +0000 (GMT) X-AuditID: cbfec7ef-f79e76d000005b57-15-57ea75e71282 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 18.C7.10494.AB57AE75; Tue, 27 Sep 2016 14:35:54 +0100 (BST) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OE600AGC0GSQO20@eusync2.samsung.com>; Tue, 27 Sep 2016 14:36:37 +0100 (BST) From: Andrzej Hajda To: Daniel Vetter Subject: [RFC PATCH 5/6] drm/hisilicon: use helper for arming crtc completion event Date: Tue, 27 Sep 2016 15:36:18 +0200 Message-id: <1474983379-852-6-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1474983379-852-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrGIsWRmVeSWpSXmKPExsWy7djPc7rPS1+FGzw+JGhxa905VouNM9az WvzfNpHZ4srX92wWa4/cZXdg9dj7bQGLx/3u40wefVtWMQYwR3HZpKTmZJalFunbJXBl7Pl8 n61gI1dF88GfbA2MTzm6GDk5JARMJH69/MIGYYtJXLi3Hsjm4hASWMYocehkFwuE85lR4t2D 00AZDrCOyR+94IpuvN4KVfSfUWLZn6vsIKPYBDQl/m6+CTZWREBZon/zHFaQImaB9YwSa55N YARJCAuESizuaWMEmcoioCqxEiLMK+AoseT0fFaIk+Qkbp7rZAaxOQWcJCa++MkMMkdC4Dab xPG9Z6AukpXYdIAZwnSReHMuG6JVWOLV8S3sELaMxOXJ3SwQrd2MEp/6T7BDOFMYJf59mMEM UWUtcfj4RbDFzAJ8EpO2TYcayivR0SYEUeIh8W/6D2hwOUq03p7MDPH8VEaJdWsmM09glFnA yLCKUSS1tDg3PbXYUK84Mbe4NC9dLzk/dxMjMDZP/zv+fgfj0+aQQ4wCHIxKPLwMRa/ChVgT y4orcw8xSnAwK4nwnisGCvGmJFZWpRblxxeV5qQWH2KU5mBREufdu+BKuJBAemJJanZqakFq EUyWiYNTqoGxtnnz5hS9auOr30I/HDLJ6E33lzF00mDcEeLiWWsw+dvuYiPLeVM3HprkLydz gXvDG6dMB+tLnEt1Lbdej3RW5DN62vQn18rxSVdQBsOL0qOPrib1G3SISf/SaUhc+376/UVB jI2fhQT6WT5vkuPZe77BMi1dLdDj96PQ1RMXnH0+7++Mg6eUWIozEg21mIuKEwG3DnT5yQIA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/xK7q7Sl+FG0z8rGJxa905VouNM9az WvzfNpHZ4srX92wWa4/cZXdg9dj7bQGLx/3u40wefVtWMQYwR7nZZKQmpqQWKaTmJeenZOal 2yqFhrjpWigp5CXmptoqRej6hgQpKZQl5pQCeUYGaMDBOcA9WEnfLsEtY8/n+2wFG7kqmg/+ ZGtgfMrRxcjBISFgIjH5o1cXIyeQKSZx4d56ti5GLg4hgSWMEgs/HGMESQgJNDJJvFktAGKz CWhK/N18kw3EFhFQlujfPIcVpIFZYD2jxIYpt8EahAVCJV6efs8EsoBFQFVi5QSwMK+Ao8SS 0/NZIZbJSdw818kMYnMKOElMfPGTGWKXo8S9ySeYJjDyLmBkWMUoklpanJueW2ykV5yYW1ya l66XnJ+7iREYotuO/dyyg7HrXfAhRgEORiUe3hX5r8KFWBPLiitzDzFKcDArifCeKwYK8aYk VlalFuXHF5XmpBYfYjQFumkis5Rocj4wfvJK4g1NDM0tDY2MLSzMjYyUxHmnfrgSLiSQnliS mp2aWpBaBNPHxMEp1cCoUq5vd6POuaH68u9L1Y9klnXIGGi4cm6t9bg+r/rfSZPUhV/+H1or IHo5ffK36VoHTqZKiTPu918n+HH/iT/yh754Mz78snvJtwlMfwvdvf/zt35fL5zhcvF88qRD ye3nd7pvSSpb/fTexRfypZVsT9K6I1/O9zr07Z7sXK3YRyeWuZp/vWt3QomlOCPRUIu5qDgR APllojJnAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20160927133638eucas1p166ffd9c015f30b48e93dc59f21b57781 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: 20160927133638eucas1p166ffd9c015f30b48e93dc59f21b57781 X-RootMTR: 20160927133638eucas1p166ffd9c015f30b48e93dc59f21b57781 References: <1474983379-852-1-git-send-email-a.hajda@samsung.com> Cc: Marek Szyprowski , dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz 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-Virus-Scanned: ClamAV using ClamSMTP Replace custom code with core helper. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index c3707d4..26f8091 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -532,7 +532,6 @@ static void ade_crtc_atomic_flush(struct drm_crtc *crtc, { struct ade_crtc *acrtc = to_ade_crtc(crtc); struct ade_hw_ctx *ctx = acrtc->ctx; - struct drm_pending_vblank_event *event = crtc->state->event; void __iomem *base = ctx->base; /* only crtc is enabled regs take effect */ @@ -542,16 +541,7 @@ static void ade_crtc_atomic_flush(struct drm_crtc *crtc, writel(ADE_ENABLE, base + ADE_EN); } - if (event) { - crtc->state->event = NULL; - - spin_lock_irq(&crtc->dev->event_lock); - if (drm_crtc_vblank_get(crtc) == 0) - drm_crtc_arm_vblank_event(crtc, event); - else - drm_crtc_send_vblank_event(crtc, event); - spin_unlock_irq(&crtc->dev->event_lock); - } + drm_crtc_arm_completion_event(crtc); } static const struct drm_crtc_helper_funcs ade_crtc_helper_funcs = {