From patchwork Fri Aug 19 09:36:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Liu X-Patchwork-Id: 9289983 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 6729660574 for ; Fri, 19 Aug 2016 10:09:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5688629395 for ; Fri, 19 Aug 2016 10:09:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B2E529397; Fri, 19 Aug 2016 10:09:21 +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 4547529395 for ; Fri, 19 Aug 2016 10:09:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 520E86EBCC; Fri, 19 Aug 2016 10:09:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 1056 seconds by postgrey-1.35 at gabe; Fri, 19 Aug 2016 10:09:17 UTC Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0081.outbound.protection.outlook.com [104.47.41.81]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD9166EBCC for ; Fri, 19 Aug 2016 10:09:17 +0000 (UTC) Received: from BN6PR03CA0062.namprd03.prod.outlook.com (10.173.137.24) by BN6PR03MB2708.namprd03.prod.outlook.com (10.173.144.15) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.549.15; Fri, 19 Aug 2016 09:37:28 +0000 Received: from BY2FFO11FD039.protection.gbl (2a01:111:f400:7c0c::167) by BN6PR03CA0062.outlook.office365.com (2603:10b6:404:4c::24) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.9 via Frontend Transport; Fri, 19 Aug 2016 09:37:28 +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 BY2FFO11FD039.mail.protection.outlook.com (10.1.14.224) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.577.8 via Frontend Transport; Fri, 19 Aug 2016 09:37:27 +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 u7J9bIS5021936; Fri, 19 Aug 2016 02:37:25 -0700 From: Liu Ying To: Subject: [PATCH v3 2/3] drm/imx: ipuv3-crtc: Use the callback ->atomic_disable instead of ->disable Date: Fri, 19 Aug 2016 17:36:58 +0800 Message-ID: <1471599419-29009-3-git-send-email-gnuiyl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471599419-29009-1-git-send-email-gnuiyl@gmail.com> References: <1471599419-29009-1-git-send-email-gnuiyl@gmail.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131160730480291351; (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)(305945005)(77096005)(55446002)(86362001)(7846002)(105596002)(50986999)(2906002)(11100500001)(81156014)(73972006)(87936001)(19580395003)(83322999)(586003)(76176999)(50226002)(106466001)(97736004)(2950100001)(6260500002)(87572001)(229853001)(5003940100001)(76482005)(2351001)(189998001)(626004)(81166006)(8936002)(47776003)(8676002)(33646002)(36756003)(4326007)(50466002)(92566002)(61266001)(81442002)(73392002)(104016004)(356003)(82202001)(19580405001)(68736007)(48376002)(110136002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2708; H:tx30smr01.am.freescale.net; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD039; 1:dGWYN6aTMMAx8Se7WtpxvQjJzdS4mENgbmd4fx/P7aqIwciccko/3N398gaqAxhbUXJiVgfm357nk+oXSGpzkvt8zsEviUwn0izvXyV4sq803qNVP3BPh+Zx85stZCQmk4wnpBEYW9QnvX5aR/wb82jXP7eZQHQNQO+H/u3e32u2cjggSGGSsNbrwtUdk45uYKNsrQ9EcvYALOwmzQ8RfOXE6wDo5denpP4zXTOJxh1fxh+T3Qv6O+QK3VNo1NuI2IDfKJ2gavfcNGEaCADQpy/pTP5Cg/j4qqNOLt3V6PN3Cg/GzifO/jVy/b/W70Pz0YpEM685U2j+k7CmMvs9dVMt2Ef2PnnToD4nwDke7pLwjwP5HFSFNRoY3N0T259TnCgdIbToIyl2hlrJe3o9BG7Sa7pqUmbsHF2993k7kePVqZK2pmi+1TTY3JrgsrfTTjYe1mCk40iLbctRHD1KDUqslmxKiNs7RL0DymOm7bo1Ud0F8O9LGZWjlIWw/dqo1Tr62FSxfdrdl1lSGZCVukP6mVH/YMPLeUsHvOjfEXAa9zE1Ecm0RfFCqSr8hixBm+bFkqYDwsrERtOiRdDYyw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b21b4415-c70c-4790-c1ae-08d3c8146f23 X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2708; 2:4Be/mRlZMUWEntZBaxuHfz40OQOZLf4wsxzMLQwugU6/SaIt1lnomleTcZfiLKbpJRtj7yKT8seu6SQQEaV8qL5vAFXHzcmk8G8Vs1qA40j7l5tgjnnUtLezBFBhH2ciKA0iewoIibY+MgQQl1LxPZxqMpt/QudO+iCtejedb+MtM+XKz7Q6PbfWxsCz+Brg; 3:7RoiluMTJSZXFEfldiwWPHE7cbct59H519Hws9wEj4Y+4qYG+HJZptjN34YkgheDO4NVk4e1HAgj8e8o8b8W2iYRP0yuj4VbvPLOkG61gCknN3Koq39vcp8hWK/DjCLl1zjPZXgkVmZofRYBIb/RzOPdtQgmXlDBY+p4g0YwT142NsjNsFS3LUm9TTuxlDjvrdML8kMPXaNzYz2CHxJlGxSvPN7lgP3CO6v2W+rnYbw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN6PR03MB2708; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2708; 25:A9cu61/e35cAx2GafzGxc+HjTRFyvIhunxaZcY6b4Sb16HuHHA5nxokN/LV1MC2DzpnRhzfuEWUc4G1dg8bepCjtgYXQ0oOOz0DUffzdhKDyPhW0R7ntE1KgQf7p7E+2Ph5KJZ73qGAfhvKf1Zures0nimgEHy0OxQHw/H84ci1G87gPs1qBnnERo8DhVf1QnkRN2jjFcWv0zo9pSBMrsyq/1drRpi7idi/ZobTe2afxXiTYSYyWLbh3w13HLYs1zVIpCSvU4o6EuxDwD1x7ZsCezeV09NwAKgI2O6zqVepmUyeiI+KfVWnQB8hra39YmP/peZpYaN3ZFP8glM/jYVQKRDLF057kkqtvseg/Hq58pE1trzFF2ryn09c3syp8YNNa1EAXC1z5Fyq65V7PpbnsB9Bx79/AZSsj8FHO2Zq9Z+QWQtW/SyT6mX1pzRJUjKlJPboa/D76NmtenbmGNK2cC4tK64tiX4m+8sSu67rZqp2JcBnfmoR+rWb2gD/nUCceAt7LKE5Qf9EldB5Yx1mo4III/IsQBxMQmivox+EvtcQx4Lyjp3ongX2gflxE8iVKjLlKxdIfOtyLpE2tnPCrD1YrXz+DUPWS+bzk3cDDZ53EP7EFkkOdy5/9xI+saElFO5pvkgb/aGqowAU+bJeHl5gKXOR3oTG4qsuuL7loai79F+77RqDH+JB1thPo5IO+E29fg7fVhvdk77mq/Q==; 31:wJJxYYY5y/KD6pR6fzN5IkSPyxAM8L/jQ94aYCWK1q6EbJd0q40Kt+9GtIWRnXpg+R+fEB9tdLHTuI7L15IISPoq1OYrdEtZp5YgvnU6GhGpKLx8yUf7qghwUkTvxR2LcjwrFYfQ+bfbPXRKz1/tfzA05Nwk61qjaTg23B8i+BQC4+WkIeknp48wKfubO5Em6gjitbJ8v/CMPnwf9a5kEvxJAIQoVfADNNTHjmQa1KY= 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)(13018025)(13015025)(13024025)(13017025)(13023025)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:BN6PR03MB2708; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2708; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2708; 4:LSY4vgvv7nfCdK4rqK1I+Mn6O4eN4ZJSLpfzGmseVEy78583Ghq9dmppwz6WmsoJJxGh7Hd5iroeKFGA2RoSudeKhg9g/G4JHplRhQuwVpsV3xZS5qA4aUv60z11UVp6QEB7Y4t+hphtM6vanDFKBiV/HUy+ZhgHRuQ0xXeifH+swkx5lOJt1h15w+NG4P2EEYOpAL5SiMXrRGLdihSdWl04iyyig4tOHLa4DQwxM/eEGvpc43vSNTQL4OutYgUdggPaCDT3hFnEMpdvsmsMfSjgOlcQs6TokN5CW9VLXErfN+DHzQCwk4e78hwY8vKQUvU5LOV4u7LHVkyS/b8I9D8DAdpVURC2cideHjd1OTu0b1HswC/2OXsM1ZlXYLdVzb7GvjFgLgb3bW8NsRjWURBda1n6WIBSPjvJKEA+E4TFXFLnqRoI8PaIp3lHtClf+l79eXvM/doBaaJjM/zMzz03SUL6isz3xhXlWkyJIhcFsG4i1zjx84w4s6CpCL4tOZY2or1c1QBrWYlQ+C1l4TvjIFwrJyhASzaoKnQQ46A= X-Forefront-PRVS: 0039C6E5C5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2708; 23:EtlN0irSyvdOZoqSFJJUjlfT3AGx4uLt2g5ufR8Z0?= =?us-ascii?Q?CgxVa91H1e4Nc7jG4VCcu1H2Yn38U4Cxzs50Qi+E93WynYpizGYH/GqH7KBv?= =?us-ascii?Q?o9PmvW0pBTlZQdrrI3qIrawbAj5pJdQzHTRAUyY2WoIU6F2YBqlP9EFLS/Sv?= =?us-ascii?Q?/yXRkYc66NdNzAYxgyl1FDOaqjvGb43VYs6TflNUKkH6zHyxaMaHZYTFakJt?= =?us-ascii?Q?NE+gczdeUmDgOdqBiziGZDO3H1fTEomvQZc+wG5IWeYcu0Rh6fveeiX7JtQY?= =?us-ascii?Q?UKpVxImTc9R62xJKjbPxoXFtwiudsMmCyAm/o7x3gxxWioXDG80aC50h3UB1?= =?us-ascii?Q?fPLR6ISdVKp/dH2qNIkKc57b60nBi3jBhfVeh3VAg2pCCIJVGW18iBNAxzqd?= =?us-ascii?Q?duTJ8bG4KqEMcW9ER3dTzZnyJHSW9xUSJB9jQKWiA5lhPuc6tiAhcv4XBuiy?= =?us-ascii?Q?KvbFRdzcWB51/Idg6l1iXRb25JXRrWWZgZMgCPwG1ErIDidDDFl3Btk/Ck57?= =?us-ascii?Q?OojMcXlfeGrxzW5NCocdUBY3ZadZOhkVgw+BMfwNnwdfIyUPTq8rZEvPBrgn?= =?us-ascii?Q?pRnnFzEmRv8ELvMpvMEs9PURI1CSLjQlDgTsyCwG0vf6lrTnoRse2Ft2ioOT?= =?us-ascii?Q?b1cftVhHoZctKxiv/ryAsLkRbgelmDJZjMAN7dQVsNKXCtSYwofXIwdFS7gt?= =?us-ascii?Q?oyXzbpAtLUnYPcQuTqNLYhZ6WRpG6AakMxVnLoEWiGzOZa0OVMtWtUIOSRON?= =?us-ascii?Q?anUQgqrPva1UD+4ECYgUwTpsAOmLXBXvwOM5G+jbDNPeeO2EGOAeV6QBTc8i?= =?us-ascii?Q?XpOBYrj2fsZbB/E6uDimpi8yHVckOBOf3ibO+mWZBJjf0X6D+NHqN/ifkdIp?= =?us-ascii?Q?CvR6DPWildlWOA+Ew2BMLw4YMNvZviajvWnPzLtreuB5nDMhkEj5xHMg2Ah6?= =?us-ascii?Q?6mHMS8Ss6+y3YEyoYYoCUJ86a1oqZLiVmY+kE86QJwuhHswOE8CTIVf9oi2G?= =?us-ascii?Q?s1ptoosXTwrjkqIyxPn84IcT29sYC3hj4ezgL8KYENkFmbg1sHnzExUVF2fk?= =?us-ascii?Q?oaFJHc/8LAQ4F5Meamp774ZEsGARScWN+5YbQu8BZaIlcklAZi42hEq5EFys?= =?us-ascii?Q?LmKBBt2QAofYoHWxagE01fxADln5d6QOr+u/Sle+rH0/DNI61wpCQegtudzn?= =?us-ascii?Q?RsQ4DS7D+j8CZj1x/6MmIXkl2VdQ/Rq98ujpB4+y1TWu6/sPV8bTj7dzBvR5?= =?us-ascii?Q?c9/L+8NOWgdb5LFYPo=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2708; 6:o1Y4Fr+3wUv4ovl0AWmR3vs9e44a7FytiX8mWHTzfASuwGK4GY83S/kbMqzeNJzu4/jW8Lzba0ATzpTz8VdwKcP9Tj8di468ngj7gt05Pv+6K347JPdcsngizSZgw2DFReMbZNEFAyj7h/QSiT4mkG5cncGHRB9ZJ0UlkdZfNhxpgT1FmR/EUCVp+DREzIU1nFmRFUlYu13cZS728S8kQsBQO2WzEt1OufDjiv+gsCWN8rcUsn+Kkv9Egdamr7IuYMh3XUXuXVy+r+FRa62Gxc0D++au7oWGuFHi1+T63YA=; 5:hdRbGMk7Qcy1X/b/jy0GYUhG5cEQYvs732veAVYj/7xP0Mp65Rlg4haNq4AgDexQr8rAYmjoHp79kgcsPwIq5F4f5N/XIf6qKQ7r0U5UtNPqMJo/qW2Kay6t8kU2TId0afZ63Vi7gfpcNs3VOLxAITg42pc/+zGUrH8RTkW0Oxg=; 24:edXTtA008wDweuHUu8OP4p/oBc/Jdgx+sQPgB9ULTcxnTzcvBxs2pslUqwjvbAeC9ZtTqQ6ft9yDkt7EaTBVXVNzHXn3vT8skCBDhswxU1Y=; 7:tFM/uwbGG+nnO3mhwRA5tik5mIrYC9p7YaSLatAnbAaFdp0PhiLqD1USxo5YL7Mgqctf/hmYJ5XOYwxHE6DtCqc9Wt8GDy7IlH6Co1LXrPwjLDafi9ZUP3z85ZU2pCsOHhekjv/LnF300botEAigM+SaVteZiFY3myi9v6YCTmh9659JgqYGLUI1qDmNtkJSZj1iDFncUjypxvVAbHsowjQNKg5ucSsxcYLwZB7x9KraIhwgKEU10Lzh8pW5bG+y SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2016 09:37:27.7015 (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: BN6PR03MB2708 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: * 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, };