From patchwork Wed Mar 15 14:41:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9625837 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 7DBC26048C for ; Wed, 15 Mar 2017 14:44:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 718AE28624 for ; Wed, 15 Mar 2017 14:44:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 665EA28639; Wed, 15 Mar 2017 14:44:42 +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 EBFF328637 for ; Wed, 15 Mar 2017 14:44:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753967AbdCOOmS (ORCPT ); Wed, 15 Mar 2017 10:42:18 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:12248 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753463AbdCOOlU (ORCPT ); Wed, 15 Mar 2017 10:41:20 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OMV008VO24TPH50@mailout4.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 15 Mar 2017 14:41:17 +0000 (GMT) Received: from eusmges2.samsung.com (unknown [203.254.199.241]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170315144116eucas1p1aa7a6edeff2881a43fc9a0aa5740ab78~sFTDwIdIV0107101071eucas1p1R; Wed, 15 Mar 2017 14:41:16 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2.samsung.com (EUCPMTA) with SMTP id E5.4E.30614.C8259C85; Wed, 15 Mar 2017 14:41:16 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170315144116eucas1p1d782e0dae08ce27d5bc055e025871622~sFTDLBEn20151101511eucas1p1O; Wed, 15 Mar 2017 14:41:16 +0000 (GMT) X-AuditID: cbfec7f1-f793f6d000007796-03-58c9528ce939 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id E8.D0.06687.2F259C85; Wed, 15 Mar 2017 14:42:58 +0000 (GMT) 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 <0OMV00GPG24OBF60@eusync2.samsung.com>; Wed, 15 Mar 2017 14:41:16 +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 v3 07/10] drm/exynos: kill mode_set_nofb callback Date: Wed, 15 Mar 2017 15:41:07 +0100 Message-id: <1489588870-7785-8-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1489588870-7785-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHIsWRmVeSWpSXmKPExsWy7djP87o9QScjDObMl7K4te4cq8XGGetZ La58fc9mMen+BBaLN2/XMFmcP7+B3WLG+X1MFmuP3GV34PDYtKqTzeN+93Emjy39d9k9+ras YvT4vEkugDWKyyYlNSezLLVI3y6BK+Px+rmsBWdlK5a/qG1gPCjZxcjJISFgInHh+W0WCFtM 4sK99WxdjFwcQgJLGSXONJ9jhXA+M0qsetTFDtOxa1k/E0RiGaPEvanroZz/jBLrHh0Hm8Um oCnxd/NNNhBbREBZYtW+dnaQImaBDUwSN2c/Z+xi5OAQFnCUaOzJAalhEVCV+PPiJyOIzSvg JPH40CRmiG1yEjfPdYLZnALOEuvPzWaCiP9mk9jfATZGQkBWYtMBqHIXiXVX70LZwhKvjm+B OlpGorPjINidEgLdjBKf+k+wQzhTGCX+fZgB1WEtcfj4RVYQm1mAT2LStunMEAt4JTrahCBK PCQaDpyEGuoosfbnGWgQTWOU+PP0BeMERpkFjAyrGEVSS4tz01OLjfSKE3OLS/PS9ZLzczcx AmP59L/jH3cwvj9hdYhRgINRiYd3gu/JCCHWxLLiytxDjBIczEoivDf8gUK8KYmVValF+fFF pTmpxYcYpTlYlMR59yy4Ei4kkJ5YkpqdmlqQWgSTZeLglGpgPN9uME2rMpg3+urO1nfM5hp6 Pu+PJOZFdN38qWL00eoEq1/L/u+zQ+4Fzp9V4OX0bYF+0rzS8qhdDB1yfR/sF08U0mCfeUvx yem/gvmMJz+8lPuTtVByV51Sr3Zk+LtHm3elGR3M2vh28UrRP3wlf7nizb23ahseWxPiPSs9 se28/SnHwpUzlFiKMxINtZiLihMBzz+QAOECAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRmVeSWpSXmKPExsVy+t/xK7qfgk5GGGxaxWpxa905VouNM9az Wlz5+p7NYtL9CSwWb96uYbI4f34Du8WM8/uYLNYeucvuwOGxaVUnm8f97uNMHlv677J79G1Z xejxeZNcAGuUm01GamJKapFCal5yfkpmXrqtUmiIm66FkkJeYm6qrVKErm9IkJJCWWJOKZBn ZIAGHJwD3IOV9O0S3DIer5/LWnBWtmL5i9oGxoOSXYycHBICJhK7lvUzQdhiEhfurWfrYuTi EBJYwijx5McjKKeRSWL3uQfMIFVsApoSfzffZAOxRQSUJVbta2cHKWIW2MAkcbfvJGsXIweH sICjRGNPDkgNi4CqxJ8XPxlBbF4BJ4nHhyYxQ2yTk7h5rhPM5hRwllh/bjbYFUJANa+aDzNN YORdwMiwilEktbQ4Nz232FCvODG3uDQvXS85P3cTIzCotx37uXkH46WNwYcYBTgYlXh4J/ie jBBiTSwrrsw9xCjBwawkwnvDHyjEm5JYWZValB9fVJqTWnyI0RToqInMUqLJ+cCIyyuJNzQx NLc0NDK2sDA3MlIS5y35cCVcSCA9sSQ1OzW1ILUIpo+Jg1OqgVF+F1fDkl0mglO+lIVu1Vkt LVBdvr7r3qr1LivFlqfJCM4rLFp6aJNL2ZVAmzoew4Cym1Jvt/1SdT0dr3P9dtK0fp2QLz2R ivbXbS/Gne7uZQ6yNeJ+sbb0afjeGcGm1TeOhR6b4pzh0vt1UciMCRP6A1eeDnqrNc8x4MC5 1Nta0RP/ZH07ukKJpTgj0VCLuag4EQCfrM20gAIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170315144116eucas1p1d782e0dae08ce27d5bc055e025871622 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: 20170315144116eucas1p1d782e0dae08ce27d5bc055e025871622 X-RootMTR: 20170315144116eucas1p1d782e0dae08ce27d5bc055e025871622 References: <1489588870-7785-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 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 2d0aa11..d72777f 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 7ef2b36..527bf1d 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); u32 (*get_vblank_counter)(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,