From patchwork Fri Nov 20 08:14:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Ying X-Patchwork-Id: 7665501 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0EC119F392 for ; Fri, 20 Nov 2015 08:23:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 33C9620497 for ; Fri, 20 Nov 2015 08:23:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 50F72203AE for ; Fri, 20 Nov 2015 08:23:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A36FF6EA61; Fri, 20 Nov 2015 00:23:01 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0136.outbound.protection.outlook.com [157.56.110.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2FBE8891C5 for ; Fri, 20 Nov 2015 00:23:00 -0800 (PST) Received: from CH1PR03CA008.namprd03.prod.outlook.com (10.255.156.153) by BLUPR03MB552.namprd03.prod.outlook.com (10.141.77.145) with Microsoft SMTP Server (TLS) id 15.1.331.20; Fri, 20 Nov 2015 08:08:19 +0000 Received: from BN1BFFO11OLC002.protection.gbl (10.255.156.132) by CH1PR03CA008.outlook.office365.com (10.255.156.153) with Microsoft SMTP Server (TLS) id 15.1.325.17 via Frontend Transport; Fri, 20 Nov 2015 08:08:19 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; linux.ie; dkim=none (message not signed) header.d=none; linux.ie; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11OLC002.mail.protection.outlook.com (10.58.145.13) with Microsoft SMTP Server (TLS) id 15.1.331.11 via Frontend Transport; Fri, 20 Nov 2015 08:08:18 +0000 Received: from victor.ap.freescale.net (victor.ap.freescale.net [10.192.241.62]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tAK88EUP019182; Fri, 20 Nov 2015 01:08:16 -0700 From: Liu Ying To: Subject: [PATCH 2/5] drm/imx: ipuv3 crtc: Cleanup ipu planes in ipu_crtc_init() when necessary Date: Fri, 20 Nov 2015 16:14:08 +0800 Message-ID: <1448007251-25591-2-git-send-email-Ying.Liu@freescale.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1448007251-25591-1-git-send-email-Ying.Liu@freescale.com> References: <1448007251-25591-1-git-send-email-Ying.Liu@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11OLC002; 1:SIsqgGYGuwTXKYwKOVvQG0l/Q0rxdXwxLCbQlLnmkzAP0JJzscjFc4W7kfdRljTOzNoyCzAz5TiM6uuYfC1uArErpnUXCU8jEV6mkh5WF56ZsfOXc3mwCs2RCwGi1HDqoN4Vfnnmxb2F1urUtnyOiMDAkfV8md5UaFIjjodc6+EQL6wL7ZSrLOC/ejWdEO/vXC/IAVjgBck41MWA5oLm+IVV0l4yGlHkqDjw4pQ4H9WTrVrKE5s9PgIbf8B2P49f+4h0LBIw8O7Z/exLXIG8liHmih2cSDCCwjPZX31tt3a0L1hVjxEaDotv0GcuQzZ8q5EZCr77mgJ/ZZyvwC7Y1c4YLa121DJdX60ijXL4KRzGYrXiq9x9FKzrz3ARbGU9guyJMwl1m3erXryKkGrtuQ== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(199003)(189002)(76176999)(5008740100001)(586003)(6806005)(36756003)(5001960100002)(92566002)(48376002)(104016004)(50986999)(5003940100001)(189998001)(87936001)(19580395003)(106466001)(110136002)(69596002)(19580405001)(5007970100001)(50226001)(97736004)(229853001)(77096005)(11100500001)(86362001)(47776003)(81156007)(2351001)(85326001)(50466002)(2950100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR03MB552; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB552; 2:zdS6KZpJo8SlDSI1quDOMtaZOgLfW23oNNZb7i3FODzrcJGFLRA7leVp46qgag3hap5hf8T1MpaP7J2o73KVPW8AalcHrjEzJV/lDeBZtsytfvCsPAxDHp2kxyLOybAIr6pwM8BL9Yih6kTJlnWC6w==; 3:w7RLF1xY4ZXooYPwO7pekEPBOpfr+D4SKZv/hwY4OZeZyn9fKi30fegzJEj4NlozA/1A+qJgsf9g3NVpCEWGJKxouk3mG1jkAV7hPxGapGGrTUBGCpKHDyL6K6qddhzJPzwrR5blfsrip/Gsid7fHNn44Lq24mQbrNb6G3+sPgLHAONfePMz2HEep52Vhm+Odk9KAdTbRx/1H4laXf4I+TOldQhpuv+lJchxF3uty44=; 25:N8TwuorZlf8jEtQKifrWNF9en3Zh2JE8iSMPjVvB1wOk2wrpHFNGYdBdfkkI4pJPFlHiegYHJKcQ5chrj+fEXjZxSYDk7jnOkJqKZZMBrlpRNjtRQ4cvZ5goWaMnxSZW9O4CrK1M7ORLkTlmtM/09uy+wSVcjTZ3LXuoz+U0pK6krzicUmBZsy6p2ihEhfoc2pvDHGjCyfrYZFhMLS8M4K8wZzrCJKYpms9Z2BOPg/o6KQyK7f0lKj5U46a0zssrTq0nAY0erGRjCpQwQvBLRA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB552; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB552; 20:UUD+S4lZnDkZkRQ6iXLOXl5IpX4aoC3ii9qHe8uAwhlmloxS0ii7vY12kdW59bMoMYCqqlS0wroBMFJyYwMkAtNkJelxOYD2yPx6CJol1LIJN4A2e7io1VNbkZYMGZgKO9/f3+9xZG7/TzZNnK6QeyynVy02sXr45FyiN8eQgsxj94885wvzGzH3BgrH/h49XCWxr1XSFs9hrwVK4GU7mJkkL/rJ0+kGOzHUJtpD208ivWusOW+6mU75D7KD2IPaY/Bxq6/zYdzW/GjP9LBfIO8Z/bS05RiZrM76JqMj/S/YlCjVlw1uZceWiyx8dQRHTSChSzHwkERmkKM0qB9SZifwpzETt5NnzMasKnLk/Zo=; 4:X2RPzprFuhXK8pLQ62HrgT/tW3jXHSLHNIeLWgjT6ohiV5oCXac+19NtuZw2PUej7cQFxOC7vgY/KGyftsfwVO1fVhNJygeLTMF7hQSOtbl0ERjCuSWoLfDnex0uUuQ3brMox0VKKgHf7un05efazjtDx3OO/T832+TaoRvPC/S2l0oI898ZV0bw4TfjLyXujEW5IBHRFG3LhD2Wlm0hKiZqQXdR0xQpCl+HbwXt3ykQlDOgjWGSUDehmzB3SRCXnK36fH7OV8EAUY+eyy5q+eloSt9biZJfc309952G0cLwUDkkvTPkeHP/TkjMCeqz2FUGNi1TqUq82LsqBhrpW4Dwbglz19lfC4rbzjmV4J8COk8dn2+xrVB/3KsJ76V8JM2+ub8f4rB7DsSmJKJzX5VEUFWozZh+K+QrTBkf5mZf+jhwDLfWp8pZlMxcyfLC X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(10201501046)(3002001); SRVR:BLUPR03MB552; BCL:0; PCL:0; RULEID:; SRVR:BLUPR03MB552; X-Forefront-PRVS: 07665BE9D1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB552; 23:nUUf5WimekBGIrS9iAbBpXCqcKHyVqjxqtQfT6l+4X?= =?us-ascii?Q?AQISWzyu+Uj/rzZ35aXlVf1oAU2VLRSHqYcTI3GIri1+QgEXvkdX+dbBEmHq?= =?us-ascii?Q?WHpPU1AF19Un53ktOnVCNKG553HJrX6w92ZESNuhmha5kE/3T9hYkbFuhy3X?= =?us-ascii?Q?9di/paNYIcKgNqWaBv990hW4NyjYwhS7xIRIcoRt9ilgwDprSLexOYU4PxbJ?= =?us-ascii?Q?Z8CgIWmClBe7F0Ah3dXalRurnZrFi5IHEkb8FLTzw6CId4l6E/2FdEznDxBT?= =?us-ascii?Q?666aVmjFV3QKbMmltBA3VLv9t7nrcIe4bjEWkzULW1TcjQya9vibSwbDdyts?= =?us-ascii?Q?mGk/TmqfelYvBiPja2FCdATEjYNCZSnkW0cW92Q0oCDE1VneIr/scIB8op7f?= =?us-ascii?Q?3o2/xZJ1u7OTFPWCeIxkj1Vj/9LLhHa6HbBSdD3Tp3l6AcsVypu7vI4I00jD?= =?us-ascii?Q?Q4PqNWg2WbIIX5sq5gUx6gYpQ7RlZ1ORlSzkW+cLPK60+pzfBM4sotQToDby?= =?us-ascii?Q?TQoUdfFUjnIomf50Njcvmk/gWrc6CNZMFv+12P0MEZ8SUvTHfKhxX0p1jM13?= =?us-ascii?Q?Yj7O1Kk5ctYV0EB1Vh+gjrtWRu54Gsare9AMpmJMhjf6MSBtjzxYDt56uYEj?= =?us-ascii?Q?5Y4VvD9ET75RmKef13lw30taP4ycG594tyZJDnuvna6/pb/vGdRI2qmGXISM?= =?us-ascii?Q?p37IdlrEz78NZXbWP4Xts+rWkJbSZssZ1UCa/RR+FEFF3REZw5fJm2RICBHK?= =?us-ascii?Q?HYtEMTINwOSN2ESFT69T2JDhKcX0TK4T1OVKaFE4Fm2WOmDe0GejwqlxFhFP?= =?us-ascii?Q?CmJRtE9vC7LNP6h3h6i632irwADybzgMUke+GHoLQD8aQKrNkMSfnoVpfjBu?= =?us-ascii?Q?T5nfgJe8u9QaKCLbdMG6DCz3xi5+LFCXgIZoZoU1JfinNfKjT5b4jCVn9BYg?= =?us-ascii?Q?TeX+BlYjcnGULBJfUCQQQHmufGRcCV1UfTZYEQ9kVj4Y3a4LdDD0khUc6Pi9?= =?us-ascii?Q?0=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB552; 5:QDv9PXNpdpiiVGPvXYxJiuoUOQLdleBFbSTXO/evuSTYABBDBoXn4CM20tUnpgcZjVibD+Eloy0GPYesAukLZnauykWsQgh0O0VpkumQVai8LpH9bWa5czVErTNCusmiU/uKZMJEXbhDmO2gj0TFvA==; 24:BlXQhGpWJ4ogrR91L7T/kI0BQES7b/QX0BTp66w32s9TN6k/7e+aY8QUA8T3rjAXqXLwC0O8mymi/pn9Dv2IPD4HGi4re5lDIqaWAWBDruc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2015 08:08:18.7763 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB552 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-Spam-Status: No, score=-4.8 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To avoid memory leakage, we need to cleanup the initialized ipu planes in the bailout path of ipu_crtc_init(). Signed-off-by: Liu Ying --- This patch applies to the imx-drm/fixes branch of Philipp Zabel's open git. drivers/gpu/drm/imx/ipuv3-crtc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c index 67813ca..59f44df 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -371,7 +371,7 @@ static int ipu_crtc_init(struct ipu_crtc *ipu_crtc, ipu_crtc->dev->of_node); if (ret) { dev_err(ipu_crtc->dev, "adding crtc failed with %d.\n", ret); - goto err_put_resources; + goto err_cleanup_plane0; } ret = ipu_plane_get_resources(ipu_crtc->plane[0]); @@ -402,9 +402,14 @@ static int ipu_crtc_init(struct ipu_crtc *ipu_crtc, return 0; err_put_plane_res: + if (ipu_crtc->plane[1]) + ipu_plane_cleanup(ipu_crtc->plane[1]); + ipu_plane_put_resources(ipu_crtc->plane[0]); err_remove_crtc: imx_drm_remove_crtc(ipu_crtc->imx_crtc); +err_cleanup_plane0: + ipu_plane_cleanup(ipu_crtc->plane[0]); err_put_resources: ipu_put_resources(ipu_crtc);