From patchwork Fri Feb 2 08:53:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel van Vugt X-Patchwork-Id: 13542446 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1F2255769; Fri, 2 Feb 2024 08:55:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.121 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706864119; cv=none; b=iB3++85hc7PT0F8tfH6TBLD7Yp+iS4iZ/GNy2CUm2qAgpM+RMX3rMsStv9cuzl4ML8dWD8rYB4J4vEk1K8/jhozjBJjZY+FUuoXb+/g+SnTfyngOG6pYVMx/gVg6Ws1pGdNWKWdovZjJ/TlBlEICY8m1y9udYCHRXCeat4b1qoY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706864119; c=relaxed/simple; bh=CV4GH9UNJ6zNQc6c5xVZP+xrV8bnxAF5VgMaNZ9XGwg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ukCJcIYnab3qnEVvJ8ShOozgtqc2gQr/egoYQDRjXAgvfUfBkmuoxMmYSXsLWbT9I2FSpUCAbEe4nHT/Qume+NZiHFU6GoBoxwHzR6b4FsMz5MM85MNYrsBZuccNxuOJgAXNZk0VcNM2PO/3Nyw9o4nYgk94GdvmmpRWk4k4PUk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=U8UqnvCa; arc=none smtp.client-ip=185.125.188.121 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="U8UqnvCa" Received: from dragon.fritz.box (unknown [58.7.187.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 7D1AE419B1; Fri, 2 Feb 2024 08:55:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1706864103; bh=qrYMi74bcCPFGEWKyxCuYJeZThHsF8LjYHDib4wabmI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=U8UqnvCaViIiodS5APZKF6sQKAIa+eUT41hLsslejEPofW6tCDRsG1EpMjQNNoV8D gsF7wGHgRw9/nzbp7L6LgHPPBpO7ATs09FYRGDlvQzUsmhsXC3elrRUp8VmTqpK96v ZhBmbzoUoX0vnfeLN0fFUfIXvdu5G6nQMOgV7XPYeGsH/aJF9JYVdRrQ7sVnRjS9eB OzjTI518N7YaFJZ9ES+93o8PvNHBaNnPHXJMcxAS+mDZSwhDrb+q81zuLOGFhPGyeG DJR+O/EJt2v4qhV4d8bnMN54j13/tGUJQwmj/i1gH6GQUp/4h6Q+t7CQrlvk1EDLGw 2WQdXXsVRtqcA== From: Daniel van Vugt To: Cc: Daniel van Vugt , Greg Kroah-Hartman , Helge Deller , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] dummycon: Add dummycon_(un)register_switch_notifier Date: Fri, 2 Feb 2024 16:53:54 +0800 Message-ID: <20240202085408.23251-1-daniel.van.vugt@canonical.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To detect switch attempts before a real console exists. This will be used for the same purpose as dummycon_(un)register_output_notifier, for fbcon to detect a more polite time to take over. Signed-off-by: Daniel van Vugt --- drivers/video/console/dummycon.c | 35 +++++++++++++++++++++++++++----- include/linux/console.h | 2 ++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c index 14af5d9e13..55e9b600ce 100644 --- a/drivers/video/console/dummycon.c +++ b/drivers/video/console/dummycon.c @@ -83,6 +83,32 @@ static int dummycon_blank(struct vc_data *vc, int blank, int mode_switch) /* Redraw, so that we get putc(s) for output done while blanked */ return 1; } + +/* This is protected by the console_lock */ +static RAW_NOTIFIER_HEAD(dummycon_switch_nh); + +void dummycon_register_switch_notifier(struct notifier_block *nb) +{ + WARN_CONSOLE_UNLOCKED(); + + raw_notifier_chain_register(&dummycon_switch_nh, nb); +} + +void dummycon_unregister_switch_notifier(struct notifier_block *nb) +{ + WARN_CONSOLE_UNLOCKED(); + + raw_notifier_chain_unregister(&dummycon_switch_nh, nb); +} + +static int dummycon_switch(struct vc_data *vc) +{ + WARN_CONSOLE_UNLOCKED(); + + raw_notifier_call_chain(&dummycon_switch_nh, 0, vc); + + return 0; +} #else static void dummycon_putc(struct vc_data *vc, int c, int ypos, int xpos) { } static void dummycon_putcs(struct vc_data *vc, const unsigned short *s, @@ -91,6 +117,10 @@ static int dummycon_blank(struct vc_data *vc, int blank, int mode_switch) { return 0; } +static int dummycon_switch(struct vc_data *vc) +{ + return 0; +} #endif static const char *dummycon_startup(void) @@ -120,11 +150,6 @@ static bool dummycon_scroll(struct vc_data *vc, unsigned int top, return false; } -static int dummycon_switch(struct vc_data *vc) -{ - return 0; -} - /* * The console `switch' structure for the dummy console * diff --git a/include/linux/console.h b/include/linux/console.h index 779d388af8..8fd70ae623 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -531,5 +531,7 @@ extern void console_init(void); /* For deferred console takeover */ void dummycon_register_output_notifier(struct notifier_block *nb); void dummycon_unregister_output_notifier(struct notifier_block *nb); +void dummycon_register_switch_notifier(struct notifier_block *nb); +void dummycon_unregister_switch_notifier(struct notifier_block *nb); #endif /* _LINUX_CONSOLE_H */ From patchwork Fri Feb 2 08:53:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel van Vugt X-Patchwork-Id: 13542447 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FDBB60257; Fri, 2 Feb 2024 08:55:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.121 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706864146; cv=none; b=rVIHaSTdsQ9QiXnDiSCKX6BOPSEnSE0kwgZPyb0+M+2pBYfpQVPVe+9Rq+Kw7k0htWDmcsnjQD3h78VEwmYO+IKT70XS1oEKJ/I5AevCJiWAm5QEBTNvcRR+LB6Vmdbbf782a3SZ7nzB//2d9PS7YW1cW9xRObhDMPCl4y5c27Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706864146; c=relaxed/simple; bh=QJN4byeE5cmqPJcwaf5F7ajBalsBJwhZ6yaGrvXhP0c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aEjVoj/2imqTYFeQ+SpR4pEqAuETzcPBmKJbz2XY8kZKQqJiRuNqpVWld6KiPKk5/43T1kroTAJIQS5xbgiwqqoEqDC7ndfUKiCWlBHj1wBm0kZx0JlHSMTY5HCKeOVg+WIyhxVtpK3gh12QHeygyu9I9E5LJbwnrNJ5+5FNogQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=jSwxgw1o; arc=none smtp.client-ip=185.125.188.121 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="jSwxgw1o" Received: from dragon.fritz.box (unknown [58.7.187.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 6EE233FE92; Fri, 2 Feb 2024 08:55:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1706864133; bh=9y1paqiSjtE07Weh2QloWiCQOyB0q+cBO1seRMkGQ5U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jSwxgw1oinexsw8k0fTHX+F+36OtyHCsA6707oBJrYH9KWdzlxTFxDutKv68xnW/7 UfEwG4imbeeLaBu6PF50zny0Ko3uNsUGcnXCuDGo1+za4PyofPz1YTmmAisLYRxKFB RQNEtNMBu9f4mZqqtdFvj/420c0CRGIdO2lNVRM1c+Tt7A+UEYdnw3BlWbxh7qyskM H8Sux6yJcmNlyAU3TI/EhMQzFPNECg7SVkuhX6S8KzUlkgRfEo4V1XBNWXyBzCx/xw rqlCB9HpUFzKqVIZgLcwTjE9Y9ZM4j1yCGlS2NHDhJXaruP5ECg+/CzSaLLAqKgwA2 J40BhzF+wbxFA== From: Daniel van Vugt To: Cc: Daniel van Vugt , Mario Limonciello , Daniel Vetter , Helge Deller , Jani Nikula , Danilo Krummrich , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] fbcon: Defer console takeover for splash screens to first switch Date: Fri, 2 Feb 2024 16:53:55 +0800 Message-ID: <20240202085408.23251-2-daniel.van.vugt@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240202085408.23251-1-daniel.van.vugt@canonical.com> References: <20240202085408.23251-1-daniel.van.vugt@canonical.com> Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Until now, deferred console takeover only meant defer until there is output. But that risks stepping on the toes of userspace splash screens, as console messages may appear before the splash screen. So check for the "splash" parameter (as used by Plymouth) and if present then extend the deferral until the first switch. Closes: https://bugs.launchpad.net/bugs/1970069 Cc: Mario Limonciello Signed-off-by: Daniel van Vugt --- drivers/video/fbdev/core/fbcon.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 63af6ab034..5b9f7635f7 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -76,6 +76,7 @@ #include /* For counting font checksums */ #include #include +#include #include "fbcon.h" #include "fb_internal.h" @@ -146,6 +147,7 @@ static inline void fbcon_map_override(void) #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER static bool deferred_takeover = true; +static int initial_console = -1; #else #define deferred_takeover false #endif @@ -3341,7 +3343,7 @@ static void fbcon_register_existing_fbs(struct work_struct *work) console_unlock(); } -static struct notifier_block fbcon_output_nb; +static struct notifier_block fbcon_output_nb, fbcon_switch_nb; static DECLARE_WORK(fbcon_deferred_takeover_work, fbcon_register_existing_fbs); static int fbcon_output_notifier(struct notifier_block *nb, @@ -3358,6 +3360,21 @@ static int fbcon_output_notifier(struct notifier_block *nb, return NOTIFY_OK; } + +static int fbcon_switch_notifier(struct notifier_block *nb, + unsigned long action, void *data) +{ + struct vc_data *vc = data; + + WARN_CONSOLE_UNLOCKED(); + + if (vc->vc_num != initial_console) { + dummycon_unregister_switch_notifier(&fbcon_switch_nb); + dummycon_register_output_notifier(&fbcon_output_nb); + } + + return NOTIFY_OK; +} #endif static void fbcon_start(void) @@ -3370,7 +3387,14 @@ static void fbcon_start(void) if (deferred_takeover) { fbcon_output_nb.notifier_call = fbcon_output_notifier; - dummycon_register_output_notifier(&fbcon_output_nb); + fbcon_switch_nb.notifier_call = fbcon_switch_notifier; + initial_console = fg_console; + + if (cmdline_find_option_bool(boot_command_line, "splash")) + dummycon_register_switch_notifier(&fbcon_switch_nb); + else + dummycon_register_output_notifier(&fbcon_output_nb); + return; } #endif @@ -3417,8 +3441,10 @@ void __exit fb_console_exit(void) { #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER console_lock(); - if (deferred_takeover) + if (deferred_takeover) { dummycon_unregister_output_notifier(&fbcon_output_nb); + dummycon_unregister_switch_notifier(&fbcon_switch_nb); + } console_unlock(); cancel_work_sync(&fbcon_deferred_takeover_work);