AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-17 10:59:01 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

fbdev: remove FBINFO_MISC_USEREVENT around fb_blank

Browse Source 
With the recursion broken in the previous patch we can drop the
FBINFO_MISC_USEREVENT flag around calls to fb_blank - recursion
prevention was it's only job.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Yisheng Xie <ysxie@foxmail.com>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: Peter Rosin <peda@axentia.se>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-27-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2019-05-28 11:02:57 +02:00
parent de29ae5c09
commit 3667617347
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/video/fbdev/core/fbcon.c
View File

@ -2386,7 +2386,6 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW); fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
ops->cursor_flash = (!blank); ops->cursor_flash = (!blank);
if (!(info->flags & FBINFO_MISC_USEREVENT))
if (fb_blank(info, blank)) if (fb_blank(info, blank))
fbcon_generic_blank(vc, info, blank); fbcon_generic_blank(vc, info, blank);
} }

3
drivers/video/fbdev/core/fbmem.c
View File

@ -1194,10 +1194,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
case FBIOBLANK: case FBIOBLANK:
console_lock(); console_lock();
lock_fb_info(info); lock_fb_info(info);
info->flags |= FBINFO_MISC_USEREVENT;
ret = fb_blank(info, arg); ret = fb_blank(info, arg);
info->flags &= ~FBINFO_MISC_USEREVENT;
/* might again call into fb_blank */ /* might again call into fb_blank */
fbcon_fb_blanked(info, arg); fbcon_fb_blanked(info, arg);
unlock_fb_info(info); unlock_fb_info(info);

2
drivers/video/fbdev/core/fbsysfs.c
View File

@ -306,9 +306,7 @@ static ssize_t store_blank(struct device *device,
arg = simple_strtoul(buf, &last, 0); arg = simple_strtoul(buf, &last, 0);
console_lock(); console_lock();
fb_info->flags |= FBINFO_MISC_USEREVENT;
err = fb_blank(fb_info, arg); err = fb_blank(fb_info, arg);
fb_info->flags &= ~FBINFO_MISC_USEREVENT;
/* might again call into fb_blank */ /* might again call into fb_blank */
fbcon_fb_blanked(fb_info, arg); fbcon_fb_blanked(fb_info, arg);
console_unlock(); console_unlock();