From: Max Staudt <mstaudt@suse.de>
To: b.zolnierkie@samsung.com, linux-fbdev@vger.kernel.org
Cc: mstaudt@suse.de, tiwai@suse.com, oneukum@suse.com, msrb@suse.com,
sndirsch@suse.com, michal@markovi.net,
linux-kernel@vger.kernel.org
Subject: [RFC 07/14] bootsplash: Add VT keyboard hook
Date: Wed, 25 Oct 2017 14:45:55 +0200 [thread overview]
Message-ID: <20171025124602.28292-8-mstaudt@suse.de> (raw)
In-Reply-To: <20171025124602.28292-1-mstaudt@suse.de>
Let's disable the splash if the user presses ESC or F1-F12 on a VT.
The F1-F12 check is to disable the splash on VT switches.
Signed-off-by: Max Staudt <mstaudt@suse.de>
Reviewed-by: Oliver Neukum <oneukum@suse.com>
---
drivers/tty/vt/keyboard.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index f4166263bb3a..177b35182b7c 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -47,6 +47,8 @@
#include <asm/irq_regs.h>
+#include <linux/bootsplash.h>
+
extern void ctrl_alt_del(void);
/*
@@ -1353,6 +1355,15 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
}
#endif
+ /* Deactivate bootsplash on ESC or Alt+Fxx VT switch */
+ if (((keycode >= KEY_F1 && keycode <= KEY_F12) || keycode == KEY_ESC)
+ && bootsplash_is_enabled()) {
+ bootsplash_disable();
+
+ if (keycode == KEY_ESC)
+ return;
+ }
+
if (kbd->kbdmode == VC_MEDIUMRAW) {
/*
* This is extended medium raw mode, with keys above 127
--
2.12.3
next prev parent reply other threads:[~2017-10-25 12:48 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-25 12:45 [RFC 00/14] Kernel based bootsplash Max Staudt
2017-10-25 12:45 ` [RFC 01/14] bootsplash: Initial implementation showing black screen Max Staudt
2017-10-25 17:26 ` Randy Dunlap
2017-10-25 12:45 ` [RFC 02/14] bootsplash: Add platform device Max Staudt
2017-10-25 12:45 ` [RFC 03/14] bootsplash: Flush framebuffer after drawing Max Staudt
2017-10-25 12:45 ` [RFC 04/14] bootsplash: Redraw on suspend/hibernate Max Staudt
2017-10-25 12:45 ` [RFC 05/14] bootsplash: Disable splash on oops Max Staudt
2017-10-25 12:45 ` [RFC 06/14] bootsplash: Disable on SysRq SAK Max Staudt
2017-10-25 12:45 ` Max Staudt [this message]
2017-10-25 12:45 ` [RFC 08/14] bootsplash: Add file reading and picture rendering Max Staudt
2017-10-25 17:32 ` Randy Dunlap
2017-10-25 20:27 ` Takashi Iwai
2017-10-27 11:21 ` Max Staudt
2017-10-25 12:45 ` [RFC 09/14] bootsplash: Add corner positioning Max Staudt
2017-10-25 12:45 ` [RFC 10/14] bootsplash: Add animation support Max Staudt
2017-10-25 17:20 ` Randy Dunlap
2017-10-25 17:23 ` Max Staudt
2017-10-25 12:45 ` [RFC 11/14] bootsplash: Redraw fully on console_unblank Max Staudt
2017-10-25 12:46 ` [RFC 12/14] bootsplash: Add sysfs ABI documentation Max Staudt
2017-10-25 12:46 ` [RFC 13/14] bootsplash: Add main documentation Max Staudt
2017-10-25 17:43 ` Randy Dunlap
2017-10-27 11:19 ` Max Staudt
2017-10-27 16:48 ` Randy Dunlap
2017-10-25 12:46 ` [RFC 14/14] bootsplash: Update MAINTAINERS Max Staudt
2017-11-09 11:56 ` [RFC 00/14] Kernel based bootsplash Pavel Machek
2017-11-09 12:36 ` Oliver Neukum
2017-11-09 18:45 ` Pavel Machek
2017-11-10 16:53 ` Takashi Iwai
2017-11-09 12:42 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171025124602.28292-8-mstaudt@suse.de \
--to=mstaudt@suse.de \
--cc=b.zolnierkie@samsung.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal@markovi.net \
--cc=msrb@suse.com \
--cc=oneukum@suse.com \
--cc=sndirsch@suse.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).