From 5c4507dbffe5d21c19e5ee277184cc6f89a113ba Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 10 Aug 2018 13:29:46 +0200 Subject: [PATCH] Sync FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER bugfix with upstream --- ...t-takeover-the-console-from-atomic-contex.patch | 14 +++++--------- kernel.spec | 3 +++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/0010-fbcon-Do-not-takeover-the-console-from-atomic-contex.patch b/0010-fbcon-Do-not-takeover-the-console-from-atomic-contex.patch index 815c66073..254834e4b 100644 --- a/0010-fbcon-Do-not-takeover-the-console-from-atomic-contex.patch +++ b/0010-fbcon-Do-not-takeover-the-console-from-atomic-contex.patch @@ -45,23 +45,19 @@ index a3fd510..f812891 100644 static int fbcon_output_notifier(struct notifier_block *nb, unsigned long action, void *data) -@@ -3611,9 +3626,13 @@ static int fbcon_output_notifier(struct notifier_block *nb, +@@ -3611,10 +3626,8 @@ static int fbcon_output_notifier(struct notifier_block *nb, deferred_takeover = false; logo_shown = FBCON_LOGO_DONTSHOW; - for (i = 0; i < FB_MAX; i++) { - if (registered_fb[i]) - fbcon_fb_registered(registered_fb[i]); -+ if (in_atomic() || irqs_disabled()) { -+ schedule_work(&fbcon_deferred_takeover_work); -+ } else { -+ for (i = 0; i < FB_MAX; i++) { -+ if (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; + } -- 2.18.0 diff --git a/kernel.spec b/kernel.spec index 50770c8a2..46408f196 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1907,6 +1907,9 @@ fi # # %changelog +* Fri Aug 10 2018 Hans de Goede +- Sync FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER bugfix with upstream + * Wed Aug 08 2018 Laura Abbott - 4.18.0-0.rc8.git1.1 - Linux v4.18-rc8-2-g1236568ee3cb