[RFC 05/14] bootsplash: Disable splash on oops
flat view
STALE3267d
SUPERSEDED: 1 (1M)
From: Max Staudt <hidden>
Date: 2017-10-25 12:47:55
Also in:
lkml
Subsystem:
framebuffer console, framebuffer core, framebuffer layer, the rest · Maintainers:
Helge Deller, Thomas Zimmermann, Simona Vetter, Linus Torvalds
Revision rfc of 3 in this series; 1 review trailer.
Revisions (3)
- rfc current
- v2 [diff vs current]
- v3 [diff vs current]
Signed-off-by: Max Staudt <redacted> Reviewed-by: Oliver Neukum <oneukum@suse.com> --- drivers/video/fbdev/core/fbcon.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 4ac1a33be418..cbe8a4480037 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c@@ -1333,6 +1333,15 @@ static void fbcon_cursor(struct vc_data *vc, int mode) int y; int c = scr_readw((u16 *) vc->vc_pos); + /* Disable the splash here so we don't have to hook into + * vt_console_print() in drivers/tty/vt/vt.c + * + * We'd disable the splash just before the call to + * hide_cursor() anyway, so this spot is just fine. + */ + if (oops_in_progress) + bootsplash_disable(); + ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms); if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
--
2.12.3