From patchwork Wed Mar 1 10:22:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9598121 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 82C3F604DC for ; Wed, 1 Mar 2017 10:34:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7E7E28537 for ; Wed, 1 Mar 2017 10:34:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAE8D28541; Wed, 1 Mar 2017 10:34:37 +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 D63E328537 for ; Wed, 1 Mar 2017 10:34:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752383AbdCAKee (ORCPT ); Wed, 1 Mar 2017 05:34:34 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:46937 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751529AbdCAKeb (ORCPT ); Wed, 1 Mar 2017 05:34:31 -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 <0OM4000AJSTD8400@mailout2.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 01 Mar 2017 10:22:26 +0000 (GMT) Received: from eusmges5.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170301102225eucas1p18887fc45a2b138927db672adb184571c~nuvDsjc8k3219732197eucas1p1F; Wed, 1 Mar 2017 10:22:25 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges5.samsung.com (EUCPMTA) with SMTP id BB.8F.17477.1E0A6B85; Wed, 1 Mar 2017 10:22:25 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170301102225eucas1p1e0f9d8b5692722950590c2d636866fc3~nuvDBkSbA3223832238eucas1p1J; Wed, 1 Mar 2017 10:22:25 +0000 (GMT) X-AuditID: cbfec7f5-f79d06d000004445-56-58b6a0e16d17 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id AC.CB.06687.C31A6B85; Wed, 1 Mar 2017 10:23:56 +0000 (GMT) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OM4009PQSTB5Z30@eusync4.samsung.com>; Wed, 01 Mar 2017 10:22:25 +0000 (GMT) From: Andrzej Hajda To: Inki Dae , dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski Subject: [PATCH] drm/exynos: kill mode_set_nofb callback Date: Wed, 01 Mar 2017 11:22:20 +0100 Message-id: <1488363740-4912-1-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 2.7.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHIsWRmVeSWpSXmKPExsWy7djPc7oPF2yLMLg5WcHi1rpzrBYbZ6xn tbjy9T2bxaT7E1gsZpzfx2Sx9shddgc2j/vdx5k8+rasYvT4vEkugDmKyyYlNSezLLVI3y6B K2PatC3sBcdkK3YsmcvewLhLsouRk0NCwETi9J97zBC2mMSFe+vZuhi5OIQEljJK3P6zCMr5 zCjx4+0CJpiOjfd+sEIklgEltu5nh3D+M0rMbGkAq2IT0JT4u/kmG4gtIpApceDJdEaQImaB HkaJudcbwBYKC1hItC+fCVbEIqAqseTNLEYQm1fASWLS7P9sEOvkJG6e62QGaZYQOMAmsWvZ apYuRg4gR1Zi0wFmCNNFYs6LYohyYYlXx7ewQ9gyEp0dB5kgWrsZJT71n2CHcKYwSvz7MAPq a2uJw8cvsoLYzAJ8EpO2TYcayivR0SYEUeIhcfDzO6i1jhLTr4DNFxKIlfg45wHzBEbpBYwM qxhFUkuLc9NTi031ihNzi0vz0vWS83M3MQJj8fS/4193MC49ZnWIUYCDUYmHN6Nza4QQa2JZ cWXuIUYJDmYlEd6Alm0RQrwpiZVVqUX58UWlOanFhxilOViUxHn3LLgSLiSQnliSmp2aWpBa BJNl4uCUamC0f72Z78Wij/55AvIHtrzcaCw6zZZbz7HyUm3L1szS3PMrIkws5l56F352wpb8 Rrf/nebHPmhI3WTOvGjRnaUpaM3Qe7KA6wi3/juTKLctgd2X8jPulplfZJ4ZyljbkbZN3Hb7 K4v54Ww3lnC6h+7+3PP01V/uAAtLhfMzF76qf96TciSnQVyJpTgj0VCLuag4EQAjnDpXwQIA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMLMWRmVeSWpSXmKPExsVy+t/xa7o2C7dFGByaz2hxa905VouNM9az Wlz5+p7NYtL9CSwWM87vY7JYe+QuuwObx/3u40wefVtWMXp83iQXwBzlZpORmpiSWqSQmpec n5KZl26rFBripmuhpJCXmJtqqxSh6xsSpKRQlphTCuQZGaABB+cA92AlfbsEt4xp07awFxyT rdixZC57A+MuyS5GTg4JAROJjfd+sELYYhIX7q1n62Lk4hASWMIo0Tf7AzOE08gkcW79TTaQ KjYBTYm/myFsEYFMiZfN68GKmAX6GCUa/64CSwgLWEi0L58JZrMIqEoseTOLEcTmFXCSmDT7 PxvEOjmJm+c6mScwci9gZFjFKJJaWpybnltsqFecmFtcmpeul5yfu4kRGIDbjv3cvIPx0sbg Q4wCHIxKPLwZnVsjhFgTy4orcw8xSnAwK4nwBrRsixDiTUmsrEotyo8vKs1JLT7EaAq0fCKz lGhyPjA68kriDU0MzS0NjYwtLMyNjJTEeUs+XAkXEkhPLEnNTk0tSC2C6WPi4JRqYFzws6H1 04Ug7ocLHsU/zvW/7sqcVfvYbvuZRq3czbvPlD21+DlLJ6zyH1foxLL1obZnjN/rTxba7itz +HB8svz1pxd/HZjo2t4lEbhI4+TZfTLNl91vPv7Z7fTeNuVL5e+O529+t1Qa+t7OUD1t80R8 zuHV+VX+CQcmpEns+LPCSFh8W2yemacSS3FGoqEWc1FxIgDIR3TpVgIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170301102225eucas1p1e0f9d8b5692722950590c2d636866fc3 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 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: 20170301102225eucas1p1e0f9d8b5692722950590c2d636866fc3 X-RootMTR: 20170301102225eucas1p1e0f9d8b5692722950590c2d636866fc3 References: 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 All Exynos CRTCs are fully configured by .enable callback. The only users of mode_set_nofb actually did nothing in their callbacks - they immediately returned because devices were in suspend state - mode_set_nofb is always called on disabled device. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 - drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 ---------- drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 -- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 - 4 files changed, 14 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index 1ffb0b1..3e88269 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -581,7 +581,6 @@ static void decon_disable(struct exynos_drm_crtc *crtc) static const struct exynos_drm_crtc_ops decon_crtc_ops = { .enable = decon_enable, .disable = decon_disable, - .commit = decon_commit, .enable_vblank = decon_enable_vblank, .disable_vblank = decon_disable_vblank, .atomic_begin = decon_atomic_begin, diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index 3279300..0c9a775 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -49,15 +49,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) } } -static void -exynos_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) -{ - struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); - - if (exynos_crtc->ops->commit) - exynos_crtc->ops->commit(exynos_crtc); -} - static int exynos_crtc_atomic_check(struct drm_crtc *crtc, struct drm_crtc_state *state) { @@ -93,7 +84,6 @@ static void exynos_crtc_atomic_flush(struct drm_crtc *crtc, static const struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = { .enable = exynos_drm_crtc_enable, .disable = exynos_drm_crtc_disable, - .mode_set_nofb = exynos_drm_crtc_mode_set_nofb, .atomic_check = exynos_crtc_atomic_check, .atomic_begin = exynos_crtc_atomic_begin, .atomic_flush = exynos_crtc_atomic_flush, diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index c12b390..e52f70a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -115,7 +115,6 @@ struct exynos_drm_plane_config { * * @enable: enable the device * @disable: disable the device - * @commit: set current hw specific display mode to hw. * @enable_vblank: specific driver callback for enabling vblank interrupt. * @disable_vblank: specific driver callback for disabling vblank interrupt. * @atomic_check: validate state @@ -130,7 +129,6 @@ struct exynos_drm_crtc; struct exynos_drm_crtc_ops { void (*enable)(struct exynos_drm_crtc *crtc); void (*disable)(struct exynos_drm_crtc *crtc); - void (*commit)(struct exynos_drm_crtc *crtc); int (*enable_vblank)(struct exynos_drm_crtc *crtc); void (*disable_vblank)(struct exynos_drm_crtc *crtc); int (*atomic_check)(struct exynos_drm_crtc *crtc, diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 0b74e57..bf5135c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -942,7 +942,6 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable) static const struct exynos_drm_crtc_ops fimd_crtc_ops = { .enable = fimd_enable, .disable = fimd_disable, - .commit = fimd_commit, .enable_vblank = fimd_enable_vblank, .disable_vblank = fimd_disable_vblank, .atomic_begin = fimd_atomic_begin,