From: Max Staudt <mstaudt@suse.de>
To: b.zolnierkie@samsung.com, linux-fbdev@vger.kernel.org
Cc: michal@markovi.net, sndirsch@suse.com, oneukum@suse.com,
tiwai@suse.com, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, mstaudt@suse.de,
bernhard.rosenkranzer@linaro.org, philm@manjaro.org
Subject: [RFC PATCH v2 06/13] vt: Redraw bootsplash fully on console_unblank
Date: Wed, 13 Dec 2017 20:47:48 +0100 [thread overview]
Message-ID: <20171213194755.3409-7-mstaudt@suse.de> (raw)
In-Reply-To: <20171213194755.3409-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.
This corner case was introduced with selective re-drawing while
implementing animations.
Without this patch, the following happens:
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 c8642142cfea..13fcaabbc2ca 100644
--- a/drivers/video/fbdev/core/bootsplash.c
+++ b/drivers/video/fbdev/core/bootsplash.c
@@ -165,6 +165,13 @@ bool bootsplash_would_render_now(void)
&& bootsplash_is_enabled();
}
+void bootsplash_mark_dirty(void)
+{
+ mutex_lock(&splash_state.data_lock);
+ splash_state.splash_fb = NULL;
+ mutex_unlock(&splash_state.data_lock);
+}
+
bool bootsplash_is_enabled(void)
{
bool was_enabled;
@@ -206,9 +213,7 @@ void bootsplash_enable(void)
if (!was_enabled) {
/* Force a full redraw when the splash is re-activated */
- mutex_lock(&splash_state.data_lock);
- splash_state.splash_fb = NULL;
- mutex_unlock(&splash_state.data_lock);
+ bootsplash_mark_dirty();
schedule_work(&splash_state.work_redraw_vc);
}
@@ -272,9 +277,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_state.data_lock);
- splash_state.splash_fb = NULL;
- mutex_unlock(&splash_state.data_lock);
+ bootsplash_mark_dirty();
if (bootsplash_would_render_now())
schedule_work(&splash_state.work_redraw_vc);
diff --git a/include/linux/bootsplash.h b/include/linux/bootsplash.h
index c6dd0b43180d..4075098aaadd 100644
--- a/include/linux/bootsplash.h
+++ b/include/linux/bootsplash.h
@@ -19,6 +19,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);
@@ -31,6 +33,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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2017-12-13 19:48 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-13 19:47 [RFC PATCH v2 00/13] Kernel based bootsplash Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 01/13] bootsplash: Initial implementation showing black screen Max Staudt
2017-12-13 23:55 ` Randy Dunlap
2017-12-14 15:37 ` Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 02/13] bootsplash: Add file reading and picture rendering Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 03/13] bootsplash: Flush framebuffer after drawing Max Staudt
2017-12-13 21:35 ` Daniel Vetter
2017-12-14 15:36 ` Max Staudt
2017-12-19 12:23 ` Daniel Vetter
2017-12-19 13:34 ` Max Staudt
2017-12-19 13:57 ` Daniel Vetter
2017-12-19 14:07 ` Oliver Neukum
2017-12-31 12:53 ` Alan Cox
2018-01-03 18:04 ` Max Staudt
2017-12-19 15:41 ` Max Staudt
2017-12-19 16:02 ` Daniel Vetter
2017-12-19 16:23 ` Max Staudt
2017-12-20 9:45 ` Daniel Vetter
2017-12-19 16:09 ` Daniel Vetter
2017-12-19 16:26 ` Max Staudt
2017-12-19 21:01 ` Ray Strode
2017-12-20 13:14 ` Max Staudt
2017-12-20 15:35 ` Ray Strode
2017-12-20 16:52 ` Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 04/13] bootsplash: Add corner positioning Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 05/13] bootsplash: Add animation support Max Staudt
2017-12-13 19:47 ` Max Staudt [this message]
2017-12-13 19:47 ` [RFC PATCH v2 07/13] vt: Add keyboard hook to disable bootsplash Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 08/13] sysrq: Disable bootsplash on SAK Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 09/13] fbcon: Disable bootsplash on oops Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 10/13] Documentation: Add bootsplash main documentation Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 11/13] bootsplash: sysfs entries to load and unload files Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 12/13] tools/bootsplash: Add a basic splash file creation tool Max Staudt
2017-12-13 19:47 ` [RFC PATCH v2 13/13] tools/bootsplash: Add script and data to create sample file Max Staudt
2017-12-13 19:52 ` [RFC PATCH v2 00/13] Kernel based bootsplash Max Staudt
2017-12-19 16:16 ` Daniel Vetter
2017-12-19 17:04 ` Max Staudt
2017-12-19 17:26 ` Daniel Vetter
2017-12-19 18:40 ` Max Staudt
2017-12-20 9:43 ` Daniel Vetter
2017-12-20 10:06 ` Neil Armstrong
2017-12-20 10:14 ` Daniel Vetter
2017-12-20 14:55 ` Max Staudt
2017-12-20 15:11 ` Daniel Vetter
2017-12-20 15:19 ` Daniel Vetter
2017-12-20 15:22 ` Daniel Vetter
2017-12-20 16:23 ` Max Staudt
2017-12-20 16:15 ` Max Staudt
2017-12-31 12:44 ` Alan Cox
2018-01-03 18:00 ` Max Staudt
2017-12-20 14:16 ` Max Staudt
2017-12-20 14:10 ` Max Staudt
2017-12-31 12:35 ` Alan Cox
2018-01-03 17:56 ` Max Staudt
2017-12-19 20:30 ` Ray Strode
2017-12-20 13:03 ` Max Staudt
2017-12-20 15:21 ` Ray Strode
2017-12-20 16:44 ` Max Staudt
2017-12-21 14:51 ` Ray Strode
2017-12-21 16:32 ` Max Staudt
2017-12-20 11:08 ` Johannes Thumshirn
2017-12-20 11:22 ` Daniel Stone
2017-12-20 12:48 ` Johannes Thumshirn
2017-12-29 17:13 ` Jani Nikula
2018-01-03 17:38 ` Max Staudt
2017-12-21 9:48 ` Daniel Vetter
2017-12-21 16:52 ` Max Staudt
2017-12-21 15:00 ` Philip Müller
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=20171213194755.3409-7-mstaudt@suse.de \
--to=mstaudt@suse.de \
--cc=b.zolnierkie@samsung.com \
--cc=bernhard.rosenkranzer@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal@markovi.net \
--cc=oneukum@suse.com \
--cc=philm@manjaro.org \
--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).