From patchwork Wed Mar 8 14:58:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9611393 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 A67B3604DD for ; Wed, 8 Mar 2017 15:02:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 722A32857B for ; Wed, 8 Mar 2017 15:02:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6678B285C0; Wed, 8 Mar 2017 15:02:48 +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 F01E6285C1 for ; Wed, 8 Mar 2017 15:02:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751529AbdCHPCo (ORCPT ); Wed, 8 Mar 2017 10:02:44 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:65100 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751229AbdCHPCj (ORCPT ); Wed, 8 Mar 2017 10:02:39 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OMI00D984AJ95A0@mailout4.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 08 Mar 2017 14:59:07 +0000 (GMT) Received: from eusmges2.samsung.com (unknown [203.254.199.241]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170308145906eucas1p273738f290858fdd2f01f8a5a4c5c6ebc~p8Bom5Eiv2371523715eucas1p2J; Wed, 8 Mar 2017 14:59:06 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2.samsung.com (EUCPMTA) with SMTP id A3.CB.30614.A3C10C85; Wed, 8 Mar 2017 14:59:06 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170308145906eucas1p206bb5875e635d3516ae00a2ac168175e~p8Bn_wVzw2373223732eucas1p2F; Wed, 8 Mar 2017 14:59:06 +0000 (GMT) X-AuditID: cbfec7f1-f793f6d000007796-66-58c01c3aaf3d Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id E9.F4.06687.A9C10C85; Wed, 8 Mar 2017 15:00:42 +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:06 +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 12/12] drm/exynos: kill mode_set_nofb callback Date: Wed, 08 Mar 2017 15:58:46 +0100 Message-id: <1488985126-25288-13-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+NgFrrAIsWRmVeSWpSXmKPExsWy7djP87pWMgciDG6f07S4te4cq8XGGetZ La58fc9mMen+BBaLN2/XMFmcP7+B3WLG+X1MFmuP3GV34PDYtKqTzeN+93Emjy39d9k9+ras YvT4vEkugDWKyyYlNSezLLVI3y6BK+Px+rmsBWdlK5a/qG1gPCjZxcjJISFgInFm8mY2CFtM 4sK99UA2F4eQwFJGiX19KxkhnM+MEj+2X2WH6dj1/yhUYhmjxLpDU6Gc/4wSS6++YQapYhPQ lPi7+SbYXBEBZYlV+9rZQYqYBTYwSdyc/ZwRJCEs4Cix59duVhCbRUBVYs2mOWBxXgEXiT3b DzFDrJOTuHmuE8zmBIr3fZzMDDJIQuA7m0TLttlADRxAjqzEpgNQ9S4SN1/fYIGwhSVeHd8C dbaMRGfHQSaI3m5GiU/9J9ghnCmMEv8+zIDqtpY4fPwi2EXMAnwSk7ZNZ4ZYwCvR0SYEUeIh 8fHRfKihjhLdm89DvT+dUeLnlc9MExhlFjAyrGIUSS0tzk1PLTbSK07MLS7NS9dLzs/dxAiM 59P/jn/cwfj+hNUhRgEORiUeXgHhAxFCrIllxZW5hxglOJiVRHgvfN0fIcSbklhZlVqUH19U mpNafIhRmoNFSZx3z4Ir4UIC6YklqdmpqQWpRTBZJg5OqQbGSesOHfSNnbozsPLCa13H2TWm 21RlFRlyTsRtFAu/tf/t05mv1bbcaQ6/YKvTuSWQI6tl5qPwg9Fh8x48apjPpqRxqKOM5b61 tSD/z9TMhwKTs/d6z/F2ltyqN/PRZe1/mhvfpdk9kHE3qRF9qOzwOXV6+dmzOh7uF+0/P9if 07BaYmkh31wJJZbijERDLeai4kQAc3ZEU+MCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRmVeSWpSXmKPExsVy+t/xq7qzZA5EGLQuNrW4te4cq8XGGetZ La58fc9mMen+BBaLN2/XMFmcP7+B3WLG+X1MFmuP3GV34PDYtKqTzeN+93Emjy39d9k9+ras YvT4vEkugDXKzSYjNTEltUghNS85PyUzL91WKTTETddCSSEvMTfVVilC1zckSEmhLDGnFMgz MkADDs4B7sFK+nYJbhmP189lLTgrW7H8RW0D40HJLkZODgkBE4ld/48yQthiEhfurWfrYuTi EBJYwijx7fIvVpCEkEAjk8SXx44gNpuApsTfzTfZQGwRAWWJVfva2UEamAU2MEnc7TsJ1iAs 4Cix59duMJtFQFVizaY5YBt4BVwk9mw/xAyxTU7i5rlOMJsTKN73cTKQzQG0zFliab/OBEbe BYwMqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQJDetuxn5t3MF7aGHyIUYCDUYmHV0D4QIQQ a2JZcWXuIUYJDmYlEd4LX/dHCPGmJFZWpRblxxeV5qQWH2I0BbppIrOUaHI+MN7ySuINTQzN LQ2NjC0szI2MlMR5Sz5cCRcSSE8sSc1OTS1ILYLpY+LglGpgXBg+5bFZ36LPX+qSOIQzGYvq Hy079F2h/jufwf5jix8pSD+u8M5mkFbLjVjCqnwt7vbmYvnHz7mcBM3WxVjNahEr+NpRfebR NNHN272295v/NGW46P7j90HBwNvZTOm3/nXOvJTt0ybOURRiefnSIs+jfe/UawWaZmwx+bzI dIXP3HWKL/ImKbEUZyQaajEXFScCAJoXnFF/AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170308145906eucas1p206bb5875e635d3516ae00a2ac168175e 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: 20170308145906eucas1p206bb5875e635d3516ae00a2ac168175e X-RootMTR: 20170308145906eucas1p206bb5875e635d3516ae00a2ac168175e 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 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,