Commit a39a357c authored by Daniel Vetter's avatar Daniel Vetter

drm: Make drm_fb_unregister/remove accept NULL fb

These functions are used by drivers to release fbdev emulation
buffers. We need to make them resilient to NULL pointers to
make the fbdev compile/runtime knobs not cause Oopses on module
unload.

Cc: Archit Taneja <architt@codeaurora.org>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b7bdf0a8
...@@ -538,7 +538,12 @@ EXPORT_SYMBOL(drm_framebuffer_reference); ...@@ -538,7 +538,12 @@ EXPORT_SYMBOL(drm_framebuffer_reference);
*/ */
void drm_framebuffer_unregister_private(struct drm_framebuffer *fb) void drm_framebuffer_unregister_private(struct drm_framebuffer *fb)
{ {
struct drm_device *dev = fb->dev; struct drm_device *dev;
if (!fb)
return;
dev = fb->dev;
mutex_lock(&dev->mode_config.fb_lock); mutex_lock(&dev->mode_config.fb_lock);
/* Mark fb as reaped and drop idr ref. */ /* Mark fb as reaped and drop idr ref. */
...@@ -589,12 +594,17 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup); ...@@ -589,12 +594,17 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
*/ */
void drm_framebuffer_remove(struct drm_framebuffer *fb) void drm_framebuffer_remove(struct drm_framebuffer *fb)
{ {
struct drm_device *dev = fb->dev; struct drm_device *dev;
struct drm_crtc *crtc; struct drm_crtc *crtc;
struct drm_plane *plane; struct drm_plane *plane;
struct drm_mode_set set; struct drm_mode_set set;
int ret; int ret;
if (!fb)
return;
dev = fb->dev;
WARN_ON(!list_empty(&fb->filp_head)); WARN_ON(!list_empty(&fb->filp_head));
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment