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

Commit df37e225 authored by Hans de Goede's avatar Hans de Goede Committed by Bartlomiej Zolnierkiewicz
Browse files

fbcon: Do not takeover the console from atomic context 



Taking over the console involves allocating mem with GFP_KERNEL, talking
to drm drivers, etc. So this should not be done from an atomic context.

But the console-output trigger deferred console takeover may happen from an
atomic context, which leads to "BUG: sleeping function called from invalid
context" errors.

This commit fixes these errors by doing the deferred takeover from a
workqueue.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
[b.zolnierkie: remove unused variable]
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 4d64c8e0

drivers/video/fbdev/core/fbcon.c

+15 −4
Original line number Diff line number Diff line
@@ -3592,13 +3592,24 @@ static int fbcon_init_device(void) 
}



#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER

static void fbcon_register_existing_fbs(struct work_struct *work)

{

	int i;



	console_lock();



	for_each_registered_fb(i)

		fbcon_fb_registered(registered_fb[i]);



	console_unlock();

}



static struct notifier_block fbcon_output_nb;

static DECLARE_WORK(fbcon_deferred_takeover_work, fbcon_register_existing_fbs);



static int fbcon_output_notifier(struct notifier_block *nb,

				 unsigned long action, void *data)

{

	int i;



	WARN_CONSOLE_UNLOCKED();



	pr_info("fbcon: Taking over console\n");
@@ -3607,8 +3618,8 @@ static int fbcon_output_notifier(struct notifier_block *nb, 
	deferred_takeover = false;

	logo_shown = FBCON_LOGO_DONTSHOW;



	for_each_registered_fb(i)

		fbcon_fb_registered(registered_fb[i]);

	/* We may get called in atomic context */

	schedule_work(&fbcon_deferred_takeover_work);



	return NOTIFY_OK;

}