From patchwork Wed Dec 13 19:47:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 'Max Staudt X-Patchwork-Id: 10110811 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 7BF7B603ED for ; Wed, 13 Dec 2017 19:53:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6EE6327F82 for ; Wed, 13 Dec 2017 19:53:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C8CC285FC; Wed, 13 Dec 2017 19:53:24 +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 112A429AA7 for ; Wed, 13 Dec 2017 19:51:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753714AbdLMTsp (ORCPT ); Wed, 13 Dec 2017 14:48:45 -0500 Received: from mx2.suse.de ([195.135.220.15]:53720 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753144AbdLMTso (ORCPT ); Wed, 13 Dec 2017 14:48:44 -0500 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 7319DAEAC; Wed, 13 Dec 2017 19:48:42 +0000 (UTC) From: Max Staudt To: b.zolnierkie@samsung.com, linux-fbdev@vger.kernel.org Cc: mstaudt@suse.de, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, tiwai@suse.com, oneukum@suse.com, msrb@suse.com, sndirsch@suse.com, michal@markovi.net, philm@manjaro.org, bernhard.rosenkranzer@linaro.org Subject: [RFC PATCH v2 06/13] vt: Redraw bootsplash fully on console_unblank Date: Wed, 13 Dec 2017 20:47:48 +0100 Message-Id: <20171213194755.3409-7-mstaudt@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20171213194755.3409-1-mstaudt@suse.de> References: <20171213194755.3409-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. 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 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 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()