Commit 6ab20a05 authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/fb-helper: generic: Don't take module ref for fbcon 



It's now safe to let fbcon unbind automatically on fbdev unregister.
The crash problem was fixed in commit 2122b405
("fbdev: fbcon: Fix unregister crash when more than one framebuffer")

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190210131039.52664-13-noralf@tronnes.org
parent eb73e1d5

drivers/gpu/drm/drm_fb_helper.c

+4 −2
Original line number Diff line number Diff line
@@ -3024,7 +3024,8 @@ static int drm_fbdev_fb_open(struct fb_info *info, int user) 
{

	struct drm_fb_helper *fb_helper = info->par;



	if (!try_module_get(fb_helper->dev->driver->fops->owner))

	/* No need to take a ref for fbcon because it unbinds on unregister */

	if (user && !try_module_get(fb_helper->dev->driver->fops->owner))

		return -ENODEV;



	return 0;
@@ -3034,6 +3035,7 @@ static int drm_fbdev_fb_release(struct fb_info *info, int user) 
{

	struct drm_fb_helper *fb_helper = info->par;



	if (user)

		module_put(fb_helper->dev->driver->fops->owner);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE