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.vet...@intel.com>
Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
Cc: Bartlomiej Zolnierkiewicz <b.zolnier...@samsung.com>
Cc: Hans de Goede <hdego...@redhat.com>
Cc: Yisheng Xie <ys...@foxmail.com>
Cc: "Michał Mirosław" <mirq-li...@rere.qmqm.pl>
Cc: Peter Rosin <p...@axentia.se>
Cc: Mikulas Patocka <mpato...@redhat.com>
Cc: Rob Clark <robdcl...@gmail.com>
---
drivers/video/fbdev/core/fbcon.c | 5 ++---
drivers/video/fbdev/core/fbmem.c | 3 ---
drivers/video/fbdev/core/fbsysfs.c | 2 --
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index d9f545f1a81b..8a67505167ae 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -2386,9 +2386,8 @@ static int fbcon_blank(struct vc_data *vc, int blank, int
mode_switch)
fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
ops->cursor_flash = (!blank);
- if (!(info->flags & FBINFO_MISC_USEREVENT))
- if (fb_blank(info, blank))
- fbcon_generic_blank(vc, info, blank);
+ if (fb_blank(info, blank))
+ fbcon_generic_blank(vc, info, blank);
}
if (!blank)
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index d6713dce9e31..25ae466ba593 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1194,10 +1194,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned
int cmd,
case FBIOBLANK:
console_lock();
lock_fb_info(info);
- info->flags |= FBINFO_MISC_USEREVENT;
ret = fb_blank(info, arg);
- info->flags &= ~FBINFO_MISC_USEREVENT;
-
/* might again call into fb_blank */
fbcon_fb_blanked(info, arg);
unlock_fb_info(info);
diff --git a/drivers/video/fbdev/core/fbsysfs.c
b/drivers/video/fbdev/core/fbsysfs.c
index 252d4f52d2a5..882b471d619e 100644
--- a/drivers/video/fbdev/core/fbsysfs.c
+++ b/drivers/video/fbdev/core/fbsysfs.c
@@ -310,9 +310,7 @@ static ssize_t store_blank(struct device *device,
arg = simple_strtoul(buf, &last, 0);
console_lock();
- fb_info->flags |= FBINFO_MISC_USEREVENT;
err = fb_blank(fb_info, arg);
- fb_info->flags &= ~FBINFO_MISC_USEREVENT;
/* might again call into fb_blank */
fbcon_fb_blanked(fb_info, arg);
console_unlock();
--
2.20.1
