fbdev: remove FBINFO_MISC_USEREVENT around fb_blank

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

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index be179b47d1c69c83e02e22f770c95bea20987b58..4afbc7d8c68c90ae714687c4b0b8072004e769b7 100644 (file)
--- 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 d6713dce9e3161c8877d88e7a12e1dfe0c2cd968..25ae466ba593fd637304f12d57d327b574604b1f 100644 (file)
--- 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 6e39066774a63e9c8a4a16affe045893c6378690..d54c88f88991da073585989ded29cb1d1ffd9db0 100644 (file)
--- a/drivers/video/fbdev/core/fbsysfs.c
+++ b/drivers/video/fbdev/core/fbsysfs.c
@@ -306,9 +306,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();