From: Stefan Agner <stefan@agner.ch>
To: daniel.vetter@ffwll.ch, meng.yi@nxp.com, dri-devel@lists.freedesktop.org
Cc: jianwei.wang.chn@gmail.com, linux-kernel@vger.kernel.org,
alison.wang@freescale.com
Subject: [PATCH 1/3] drm/fb_cma_helper: do not free fbdev if there is none
Date: Wed, 19 Oct 2016 17:32:19 -0700 [thread overview]
Message-ID: <20161020003221.2941-2-stefan@agner.ch> (raw)
In-Reply-To: <20161020003221.2941-1-stefan@agner.ch>
If fbdev emulation is not in use (or not built-in), fb_helper.fbdev
is NULL. Don't call calling drm_fbdev_cma_defio_fini in this case.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
drivers/gpu/drm/drm_fb_cma_helper.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index 1fd6eac..12d654d 100644
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -557,7 +557,8 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_init);
void drm_fbdev_cma_fini(struct drm_fbdev_cma *fbdev_cma)
{
drm_fb_helper_unregister_fbi(&fbdev_cma->fb_helper);
- drm_fbdev_cma_defio_fini(fbdev_cma->fb_helper.fbdev);
+ if (fbdev_cma->fb_helper.fbdev)
+ drm_fbdev_cma_defio_fini(fbdev_cma->fb_helper.fbdev);
drm_fb_helper_release_fbi(&fbdev_cma->fb_helper);
if (fbdev_cma->fb) {
--
2.10.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-10-20 0:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-20 0:32 [PATCH 0/3] drm/fsl-dcu: fix driver remove/DRM unload Stefan Agner
2016-10-20 0:32 ` Stefan Agner [this message]
2016-10-20 6:42 ` [PATCH 1/3] drm/fb_cma_helper: do not free fbdev if there is none Daniel Vetter
2016-10-20 0:32 ` [PATCH 2/3] drm/fsl-dcu: unload driver before disabling clocks Stefan Agner
2016-10-20 0:32 ` [PATCH 3/3] drm/fsl-dcu: disable outputs before unloading driver Stefan Agner
2016-11-17 0:59 ` [PATCH 0/3] drm/fsl-dcu: fix driver remove/DRM unload Stefan Agner
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=20161020003221.2941-2-stefan@agner.ch \
--to=stefan@agner.ch \
--cc=alison.wang@freescale.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=jianwei.wang.chn@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=meng.yi@nxp.com \
/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).