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 05/14] bootsplash: Disable splash on oops
Date: Wed, 25 Oct 2017 14:45:53 +0200 [thread overview]
Message-ID: <20171025124602.28292-6-mstaudt@suse.de> (raw)
In-Reply-To: <20171025124602.28292-1-mstaudt@suse.de>
Signed-off-by: Max Staudt <mstaudt@suse.de>
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
next prev parent reply other threads:[~2017-10-25 12:47 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 ` Max Staudt [this message]
2017-10-25 12:45 ` [RFC 06/14] bootsplash: Disable on SysRq SAK Max Staudt
2017-10-25 12:45 ` [RFC 07/14] bootsplash: Add VT keyboard hook Max Staudt
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-6-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).