diff options
| author | Noralf Trønnes <noralf@tronnes.org> | 2019-02-10 14:10:39 +0100 |
|---|---|---|
| committer | Noralf Trønnes <noralf@tronnes.org> | 2019-02-21 12:24:28 +0100 |
| commit | 6ab20a05f4c7ed45632e24d5397d6284e192567d (patch) | |
| tree | a57ec11aa3ea964f31003a99e3a8bb139dcc30c1 /drivers | |
| parent | eb73e1d5ddd85251c7788e490611371cee9e1c71 (diff) | |
| download | linux-6ab20a05f4c7ed45632e24d5397d6284e192567d.tar.bz2 | |
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 2122b40580dd
("fbdev: fbcon: Fix unregister crash when more than one framebuffer")
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190210131039.52664-13-noralf@tronnes.org
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 0e9349ff2d16..04d23cb430bf 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -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,7 +3035,8 @@ static int drm_fbdev_fb_release(struct fb_info *info, int user) { struct drm_fb_helper *fb_helper = info->par; - module_put(fb_helper->dev->driver->fops->owner); + if (user) + module_put(fb_helper->dev->driver->fops->owner); return 0; } |