diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2018-08-10 13:29:46 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2018-08-10 13:29:57 +0200 |
| commit | 5c4507dbffe5d21c19e5ee277184cc6f89a113ba (patch) | |
| tree | 6e97735ed4dad86993a843814f79d4912b9bcbe0 /0010-fbcon-Do-not-takeover-the-console-from-atomic-contex.patch | |
| parent | 6940250e4a7308db76ca7b37f5c3457fe03c31e0 (diff) | |
| download | kernel-5c4507dbffe5d21c19e5ee277184cc6f89a113ba.tar.gz kernel-5c4507dbffe5d21c19e5ee277184cc6f89a113ba.tar.xz kernel-5c4507dbffe5d21c19e5ee277184cc6f89a113ba.zip | |
Sync FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER bugfix with upstream
Diffstat (limited to '0010-fbcon-Do-not-takeover-the-console-from-atomic-contex.patch')
| -rw-r--r-- | 0010-fbcon-Do-not-takeover-the-console-from-atomic-contex.patch | 14 |
1 files changed, 5 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 |