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 11/14] bootsplash: Redraw fully on console_unblank
Date: Wed, 25 Oct 2017 14:45:59 +0200 [thread overview]
Message-ID: <20171025124602.28292-12-mstaudt@suse.de> (raw)
In-Reply-To: <20171025124602.28292-1-mstaudt@suse.de>
After exiting a KD_GRAPHICS program and falling back to the text
console, a previously enabled splash needs to be fully redrawn.
Without this patch, the following fails:
1. Switch to a text console
2. Enable splash
3. Start X (or any other KD_GRAPHICS program)
4. Exit X
5. Splash is not seen, apart from animations
Signed-off-by: Max Staudt <mstaudt@suse.de>
Reviewed-by: Oliver Neukum <oneukum@suse.com>
---
drivers/tty/vt/vt.c | 2 ++
drivers/video/fbdev/core/bootsplash.c | 15 +++++++++------
include/linux/bootsplash.h | 4 ++++
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 2ebaba16f785..416735ab6dc1 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -102,6 +102,7 @@
#include <linux/uaccess.h>
#include <linux/kdb.h>
#include <linux/ctype.h>
+#include <linux/bootsplash.h>
#define MAX_NR_CON_DRIVER 16
@@ -3903,6 +3904,7 @@ void do_unblank_screen(int leaving_gfx)
}
console_blanked = 0;
+ bootsplash_mark_dirty();
if (vc->vc_sw->con_blank(vc, 0, leaving_gfx) || vt_force_oops_output(vc))
/* Low-level driver cannot restore -> do it ourselves */
update_screen(vc);
diff --git a/drivers/video/fbdev/core/bootsplash.c b/drivers/video/fbdev/core/bootsplash.c
index e44376d89750..df2757d6e422 100644
--- a/drivers/video/fbdev/core/bootsplash.c
+++ b/drivers/video/fbdev/core/bootsplash.c
@@ -186,6 +186,13 @@ bool bootsplash_would_render_now(void)
&& bootsplash_is_enabled();
}
+void bootsplash_mark_dirty(void)
+{
+ mutex_lock(&splash_global.data_lock);
+ splash_global.splash_fb = NULL;
+ mutex_unlock(&splash_global.data_lock);
+}
+
bool bootsplash_is_enabled(void)
{
unsigned long flags;
@@ -242,9 +249,7 @@ void bootsplash_enable(void)
if (!was_enabled) {
/* Force a full redraw when the splash is re-activated */
- mutex_lock(&splash_global.data_lock);
- splash_global.splash_fb = NULL;
- mutex_unlock(&splash_global.data_lock);
+ bootsplash_mark_dirty();
queue_work(splash_global.wq, &splash_work_redraw_vc);
}
@@ -329,9 +334,7 @@ static int splash_resume(struct device *device)
/* Force full redraw on resume since we've probably lost the
* framebuffer's contents meanwhile
*/
- mutex_lock(&splash_global.data_lock);
- splash_global.splash_fb = NULL;
- mutex_unlock(&splash_global.data_lock);
+ bootsplash_mark_dirty();
if (bootsplash_would_render_now())
queue_work(splash_global.wq, &splash_work_redraw_vc);
diff --git a/include/linux/bootsplash.h b/include/linux/bootsplash.h
index 101e70818363..a7f36043e6f6 100644
--- a/include/linux/bootsplash.h
+++ b/include/linux/bootsplash.h
@@ -21,6 +21,8 @@ extern void bootsplash_render_full(struct fb_info *info);
extern bool bootsplash_would_render_now(void);
+extern void bootsplash_mark_dirty(void);
+
extern bool bootsplash_is_enabled(void);
extern void bootsplash_disable(void);
extern void bootsplash_enable(void);
@@ -33,6 +35,8 @@ extern void bootsplash_init(void);
#define bootsplash_would_render_now() (false)
+#define bootsplash_mark_dirty()
+
#define bootsplash_is_enabled() (false)
#define bootsplash_disable()
#define bootsplash_enable()
--
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 ` [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 ` [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 ` Max Staudt [this message]
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-12-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).