Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36676173 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarMaarten 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
parent de29ae5c

drivers/video/fbdev/core/fbcon.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

			ops->cursor_flash = (!blank);



			if (!(info->flags & FBINFO_MISC_USEREVENT))

			if (fb_blank(info, blank))

				fbcon_generic_blank(vc, info, blank);

		}

drivers/video/fbdev/core/fbmem.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

drivers/video/fbdev/core/fbsysfs.c

+0 −2
Original line number Diff line number Diff line
@@ -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();