From patchwork Wed Oct 25 12:45:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 'Max Staudt X-Patchwork-Id: 10026631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5512E601E8 for ; Wed, 25 Oct 2017 12:47:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51D7828B61 for ; Wed, 25 Oct 2017 12:47:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 456CD28B73; Wed, 25 Oct 2017 12:47:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D50C628B61 for ; Wed, 25 Oct 2017 12:47:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751522AbdJYMr0 (ORCPT ); Wed, 25 Oct 2017 08:47:26 -0400 Received: from mx2.suse.de ([195.135.220.15]:36170 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775AbdJYMqd (ORCPT ); Wed, 25 Oct 2017 08:46:33 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 96DCFAD6D; Wed, 25 Oct 2017 12:46:28 +0000 (UTC) From: Max Staudt 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 Message-Id: <20171025124602.28292-12-mstaudt@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20171025124602.28292-1-mstaudt@suse.de> References: <20171025124602.28292-1-mstaudt@suse.de> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Oliver Neukum --- 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 #include #include +#include #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()