From patchwork Fri Aug 26 07:30:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Liu X-Patchwork-Id: 9300909 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 7A12E607D8 for ; Fri, 26 Aug 2016 07:31:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F0DB29565 for ; Fri, 26 Aug 2016 07:31:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 638112956B; Fri, 26 Aug 2016 07:31:22 +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=BAD_ENC_HEADER,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,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 F0C1029565 for ; Fri, 26 Aug 2016 07:31:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B55E6E1CB; Fri, 26 Aug 2016 07:31:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0056.outbound.protection.outlook.com [104.47.40.56]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED7C06E1CB for ; Fri, 26 Aug 2016 07:31:19 +0000 (UTC) Received: from BN3PR0301CA0067.namprd03.prod.outlook.com (10.160.152.163) by BN1PR0301MB0707.namprd03.prod.outlook.com (10.160.78.139) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.13; Fri, 26 Aug 2016 07:31:09 +0000 Received: from BN1AFFO11FD046.protection.gbl (2a01:111:f400:7c10::186) by BN3PR0301CA0067.outlook.office365.com (2a01:111:e400:401e::35) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9 via Frontend Transport; Fri, 26 Aug 2016 07:31:09 +0000 Authentication-Results: spf=softfail (sender IP is 192.88.168.50) smtp.mailfrom=gmail.com; pengutronix.de; dkim=none (message not signed) header.d=none; pengutronix.de; dmarc=fail action=none header.from=gmail.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning gmail.com discourages use of 192.88.168.50 as permitted sender) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD046.mail.protection.outlook.com (10.58.53.61) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.587.6 via Frontend Transport; Fri, 26 Aug 2016 07:31:09 +0000 Received: from victor.ap.freescale.net (victor.ap.freescale.net [10.192.241.62]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u7Q7Uqoc006560; Fri, 26 Aug 2016 00:31:07 -0700 From: Liu Ying To: Subject: [PATCH v4 5/7] drm/imx: ipuv3-crtc: Use the callback ->atomic_disable instead of ->disable Date: Fri, 26 Aug 2016 15:30:42 +0800 Message-ID: <1472196644-30563-6-git-send-email-gnuiyl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472196644-30563-1-git-send-email-gnuiyl@gmail.com> References: <1472196644-30563-1-git-send-email-gnuiyl@gmail.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131166702701249761; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(199003)(189002)(55446002)(5003940100001)(8936002)(73392002)(81166006)(77096005)(105596002)(8676002)(86362001)(19580395003)(19580405001)(48376002)(50226002)(81442002)(81156014)(356003)(36756003)(7846002)(11100500001)(104016004)(189998001)(73972006)(92566002)(33646002)(50986999)(83322999)(87572001)(6260500002)(229853001)(82202001)(586003)(305945005)(47776003)(87936001)(4326007)(76176999)(2906002)(2351001)(50466002)(68736007)(5660300001)(76482005)(110136002)(2950100001)(61266001)(97736004)(626004)(106466001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0707; H:tx30smr01.am.freescale.net; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD046; 1:Oxm9+89Jewmp3bmaF8MeyWULtL1J0U+E1cgBTCqZ8uRNwwKRrt4untxhQGZVNBqT+5ziUCR153SfZ8twIgQpgjr2sbE1kkPIEG77g1X+sVrlXG5D+XkPc09/QLmh/2dvKp4pNPVD8WJ0EwCGBpMTZCBmGjrjzWmdzmNjqh4SuKioHjYj1lxNM5uUC67xrWumCqCBp2G+76Y5Ey79oi0F3rxfLutfW1p5Cnd6pD6NqrRXli7p5ozHJ5PWBPM8sk7lK3sQgrtBnMLV/rUYQW8qQ6clIEqOgdF1x/ZjY8BDLfb3tmyBw2dgtCaa5R83ESwaxFAEU7SgI3HAuVjcUh/QMlIT8OPKQGi74VGfzEegMBi8zyc9zSTcwd9moW7+zjwJHrF+CJ355o3m7zuX6OW9bOVKuPmbhxN+47VbRSDfbDXp1PmufDZMvQVIZvSQ0eKOjYtJMxzjkSVdTs1tICvbiiT0F/fjoYorxJ9O8dj4SrPYsgLi7PPhvsNimu5RN3Nz9CdYxR02pqRSoCrr2v7/En7doKIbSkJTRn1GDNPQycn8zrY6wUwFvp7wnRgzLVyX1DKOLzQnXo8CFu0raFyKWg== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: bdcb5024-6f9b-4f8b-a382-08d3cd82f352 X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0707; 2:2/1uwB3PPA7933w7TkjLWrQNLuKnO9ofBC2rwTp7dkVlQZNi/5Y35iCsjFyMSC3Y69xWXpiNwWzKgdvcYExbrgjPBxUmEbVCmt26Y4neg9ZBm7BQdjikxH4Q2gK1McKrWP0DNmfzXxMzTq7DgNcFeEgXb3LVmV07qHK7JKFckvbeSHb0YU0QV+1TMWbf7lmS; 3:n9FyKF9iJ5xhmDG/xEQCFUlAWqF/rpLyie11+qWH+VVKixqlTKSlPrDTzpxTsQENOGtnWakJvBYM+FrWglrOacNh+Qo1wkyYM+RDBdE+2/TSsNlhRLoHXfGV3Xc6umFQ6AvnU+Eqi0hpiVnflFPc4k4q9a62sFLYkjPf728qpBy+WGzr1aBIj9/WR87++qj6P27ui/Nzod+v6lDTM0okqC0WQpe8eN3M2yQv1ES5vBM=; 25:jv46mSKZQoXkJdMjK9NRJTIf8BXkWGGFIv0cZD5hlpu04QcGgu1K7rG85U1HXu4SGnCu8z/b5wbLV3xbjmEjO5JEoWD4FuT4nS5CY/7Rn6LHrqSOfmlqwqgpvWQVV5kHfAtn9uCP62ZeA/CjmHnGSPFVLf0SVyyF2itMF8Gf6vmr6oDLL6la7atYXQqwwofIAZVCCbKYicNjGWTAH/TQOeUm11UwG1c6lU3k32e2sL8TPe+YN5m/zyT65h2cUF+N7+6/gQGCRP6K2u9YOoJA1U0EqeszOtd3sIZbwOwoM4EWgZBxfjnWUmDerwuiz2KZnOH8WG8vw/QV+AEDuMCXmE4EWHNsCK3UFWT+ZqRy7oEom6on3to6IK92UnXEYQ3oPDERR0lPkaED4gt9pf/xcFG6IbPqk7uQ4yosE5XCL/w= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1PR0301MB0707; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0707; 31:CuronptZLEKs7i4xjgFwuLXGnuJWCXmEkjKPULu86cINmNXa819dSSDIn9uhOAbjOwA4ooa4DnqfAveGGu7af9zqxvlcoAygLLsOdKNnTVCCvKVG7x+gEY+39iy9ggJQow8aMGP2J54nY+BMTdKcZ5Pa4FQpSRhNhIm2nqFOqu+O6KILLG79WS+U0i7weYSM6TA3ic63B/i2jqwoKEI6CpcOat/eVjwgPutGqgf1FB4=; 4:AGbDbOEjri2SAqu+ZvIfKTS0uyptK6CRroXlAvkCz9uzrX4UM2tI66nFPtkLBZ2/8HHxW8B32Sr/M3E1PRsqmXvmOTpaWVcmBK+chZ7YCz++PkzCh7sLlpgitWBVjnc9pvPqeb4CWcSYNr+Zc9I1n1CbAM1q6hG3gvgeezpPYF58wK6eShvNPmrmWKyPfD1dnGZqvWjb++Xd001AFmD7g6/sHA9kdhwVWk8Wk0hNZO0289H0PLFH/HWgeT2qUm6KFMd5kTLOxtIbR4h+gsSNbwlFUEHaZo8kLtN6b6QEn/zN4l2ZEgYxWcqk1LD6mbfILq8mhGkF80ReD0lg61yjTWHIfueWP95NQtUnahPxDT1T2xw6WozcjAjiIPnEFU+tT/X1LBN8lHhvAx78vZfUA2zJCSm1VEkiFv55Q5uL1Od6A82YlZBZZtO/zRiM3JuQF0dufypNyzybVVHFx1PNN3PHzlKgAyXkHp2ljfHz9QxwgZZO3FIqscU2GXCqC83+lsYcVfdi7xRPZ0Hjx3C0vDIgUVb7ita0vAPRn0Q/Gm4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13024025)(13015025)(13018025)(13023025)(13017025)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:BN1PR0301MB0707; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0707; X-Forefront-PRVS: 00462943DE X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0707; 23:9LhPualckP9v8GnoUoxaEyNs8mSVRQILQMEQoo6?= =?us-ascii?Q?IPuMHjkmmGNmhTp7Rr/G0Ky947TTWKgSirBYNagc9ynkXre5p6lxnwIkWAch?= =?us-ascii?Q?7G4UzZEo5XndTzFweEaXLpoAp5XB79nNLls/tLyJLQ9ul2H/ZDCNL7QtRGeh?= =?us-ascii?Q?xqVpt1NhXIsC7yHqNOYiqebatRjr2V/rbvHofGAVmGlhdiUtyvQj2gctHYNK?= =?us-ascii?Q?YtuisHZ+K1nP5zQRzkHMbTKxfw9jKa2zpQp8vnVRx8fYI37g+FisalqHA49/?= =?us-ascii?Q?nQzMhUz1Yf3fbqZtEQfGU1LS302BbJCJKSQR54cVLiRjaCBibpyedmOwFoR0?= =?us-ascii?Q?vs7U+mra/DeKqsLHem5GIJT5zuTAVCUD47fDVEC7nNlMja/NLYgy/dujArhT?= =?us-ascii?Q?cfanrADfeU4stzABHgLAZ13BJhyDVaXLT/lOVk2xtcAcvUQRbq1lQg1hAj/8?= =?us-ascii?Q?Xcv/wedzsuhGFE/eEA4HjLT0t1wWKBso3MpkZCOKtMPe1KUpn8WEGQj46Pmn?= =?us-ascii?Q?aP6lHa3bHjsm/SYJ0nV9dchsxP68K4yDSSZ5YaGcysixd6riCedoS6drKc4c?= =?us-ascii?Q?DyB1Fp+v2yK6dtD1RLpm66FwVaYlpmcRHhYyLIpqyNd5cJs48Vm9zW/YCAhE?= =?us-ascii?Q?F36BOlwuRoaKXs2wvWz+QwLifz/rpxekmld9c7h2Bbs4VnwKK/BCjCd6nUB2?= =?us-ascii?Q?hkX2omSLRwD7B8HfOBdMOCyPS5iY878d4VghpK4rgHiqx0yOEISwHyF4Te2m?= =?us-ascii?Q?jcOlmtF1bHGh06aZr2oak0lOH7MdTIJHIrRSwKKUuIm3kT+H87XU7ZIJ/SO9?= =?us-ascii?Q?zgCItUr7HN8eInincF22whZQQHzKTnwcUxY1xX5DyhqZtlu30R76ZFJL6Hvg?= =?us-ascii?Q?28k4cPAPF3PQT1gQgFt6k1ifwFebkshzooVvb0VB4u4ZS9lpRyvAXDz2XcUV?= =?us-ascii?Q?C+QWA0hpKsb6D7Bm+/ogcjeiubloLRn0c76bDrAab3SfDyYtQP/VXQhyOkqx?= =?us-ascii?Q?hZ8X20VB61+21ikqJPe8/4TifSABmU4CPW4W+nbs0EXY5Sd2UxDONrYJQruo?= =?us-ascii?Q?3sPuUB9Us5fo7LxEDrz9eKvwti0zMJisNsJWOr7bUnfqsXtXIvRDiPCJ3u2R?= =?us-ascii?Q?enyEzAiQ53gPMpUJx5crg3tDqJt7zSG3TTd6X7nflJNw4eUwOwJz8pMFw6VO?= =?us-ascii?Q?o2wvRwOEaOKQJ2TRxoDw/wobgR2N+yiOfqRNWMmeIEYBLWuuJZM6yO46eEsG?= =?us-ascii?Q?aWFbw68/XFl+Fzw4HpdQlcTnsEJ/QUtZiib8C6+mq?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0707; 6:cYN49N7NCIwtv5CGk5RA9M15MA/SHGE1pdT4wg9AIkdB69V+Xqa6Qc3sVTKPyB3OrJLtlbR1paaDk+ATAQhPhzqFHrOwHm1EqQqLAPj8kZuEErAI/meGhksw4OnWehA4i+YntvRkv+qOaq/Ya2XSB6Qce6bJC5jXfByNh9RrFhzjmeNslk35bG6x/CXvhn1FJZKtopJqmd385KN1Luy2RER19WRNtdQn4oy10qSQ1n328Mx1168oIGhFN3twJiIRKEesDyIs5J4wBdM/MgHgK/YKfGCDjQyJcMCyqLqNnVY=; 5:dhdC3m3+dhccXomgKBH240QfGe5ukX1zt8oJbc8Bw9mMuftrqCjPvr8Sz2u8BUnCv2RyEDay1O6RIX6vASRi4+AQkxtg1rJN29HUbY9FQUve/2D39GBnXdJnSnjNFgQJ+gorIHN+KyUrCibKoxPulPkaIeJO2BjvXbCWcgdncY0=; 24:6lapPIO3wjyqXrCrpIFzyw8CKBHMK9FqaWoB1AYrIuV8w2S+rizkcLG1ydzLiLzu4Xdlyo3WJZV1dxwl+i+HgHG1Z91LiNHxOB/WiQ3PJws=; 7:Mi8KJ+rbrEc/AxzYcYUlPsFzHlxEhIleVxLgI5FBOBEthw8pGBPKRsnL/gRsR3l0meQ5b7A46kYx9ydk3aNCvT1MxrlnLTrfiTwPObDvcW2B0VfzKiU5BI+Pq4UrLLTejz2XJIIoAb/AL26Qwc/omLXFD/zP3B+9bJTQCn21CKN7bLIBl4a7/RRnQi5IR+gm5pVSVBi77E9SXhousNlmzp4svRnzVQvJ6biCB/8W0GPfxnptzZnZVQ3kLdO2OE/U SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2016 07:31:09.9221 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0301MB0707 Cc: Daniel Vetter , Peter Senna Tschudin , Russell King 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Now that the drm atomic core supports the callback ->atomic_disable, we may replace the legacy one ->disable with it. Cc: Philipp Zabel Cc: David Airlie Cc: Russell King Cc: Daniel Vetter Cc: Peter Senna Tschudin Cc: Lucas Stach Signed-off-by: Liu Ying --- v3->v4: * None. v3: * Newly introduced in v3. drivers/gpu/drm/imx/ipuv3-crtc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c index 6e1dc90..83c46bd 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -60,7 +60,8 @@ static void ipu_crtc_enable(struct drm_crtc *crtc) ipu_di_enable(ipu_crtc->di); } -static void ipu_crtc_disable(struct drm_crtc *crtc) +static void ipu_crtc_atomic_disable(struct drm_crtc *crtc, + struct drm_crtc_state *old_crtc_state) { struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc); struct ipu_soc *ipu = dev_get_drvdata(ipu_crtc->dev->parent); @@ -241,7 +242,7 @@ static const struct drm_crtc_helper_funcs ipu_helper_funcs = { .mode_set_nofb = ipu_crtc_mode_set_nofb, .atomic_check = ipu_crtc_atomic_check, .atomic_begin = ipu_crtc_atomic_begin, - .disable = ipu_crtc_disable, + .atomic_disable = ipu_crtc_atomic_disable, .enable = ipu_crtc_enable, };