From: Liu Ying <Ying.Liu@freescale.com>
To: dri-devel@lists.freedesktop.org
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 [thread overview]
Message-ID: <1448007251-25591-2-git-send-email-Ying.Liu@freescale.com> (raw)
In-Reply-To: <1448007251-25591-1-git-send-email-Ying.Liu@freescale.com>
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 <Ying.Liu@freescale.com>
---
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);
--
2.5.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-11-20 8:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-20 8:14 [PATCH 1/5] drm/imx: ipuv3 plane: Introduce ipu_plane_cleanup() Liu Ying
2015-11-20 8:14 ` Liu Ying [this message]
2015-11-23 11:48 ` [PATCH 2/5] drm/imx: ipuv3 crtc: Cleanup ipu planes in ipu_crtc_init() when necessary Philipp Zabel
2015-11-20 8:14 ` [PATCH 3/5] drm/imx: ipuv3 crtc: Cleanup ipu planes in ipu_drm_unbind() Liu Ying
2015-11-23 11:48 ` Philipp Zabel
2015-11-24 5:23 ` Liu Ying
2015-11-20 8:14 ` [PATCH 4/5] drm/imx: ipuv3 plane: Use the helper ipu_plane_cleanup() in ipu_plane_destroy() Liu Ying
2015-11-23 11:48 ` Philipp Zabel
2015-11-24 5:29 ` Liu Ying
2015-11-20 8:14 ` [PATCH 5/5] drm/imx: ipuv3 plane: Replace dev_info with dev_dbg if a plane's CRTC changes Liu Ying
2015-11-23 11:48 ` Philipp Zabel
2016-01-22 2:29 ` Liu Ying
2016-01-25 9:56 ` Philipp Zabel
2015-11-23 11:48 ` [PATCH 1/5] drm/imx: ipuv3 plane: Introduce ipu_plane_cleanup() Philipp Zabel
2015-11-24 3:31 ` Liu Ying
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448007251-25591-2-git-send-email-Ying.Liu@freescale.com \
--to=ying.liu@freescale.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).