From patchwork Wed Feb 14 05:24:07 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: 200808 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp1001573dyb; Tue, 13 Feb 2024 21:25:48 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWQB17ukwR3g2pwK3TYQVAS2bOFOtytknE+sPy+wyy0ujlRlaPzyRi/5rpfd+JFhuQx7p+/hQJsjRHJiERPjABp25zErA== X-Google-Smtp-Source: AGHT+IE1qfoM0yiAU00jHLVgUDHu2PEVQCvGY5ZgKhjzROGFQGU4ETTS4PPXgaW4F4lcd1PVziKm X-Received: by 2002:a17:906:ce47:b0:a39:7e4:28b8 with SMTP id se7-20020a170906ce4700b00a3907e428b8mr914080ejb.28.1707888348636; Tue, 13 Feb 2024 21:25:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707888348; cv=pass; d=google.com; s=arc-20160816; b=PBMn8pwjFH1mXjPhVnAehm3N4eCPihJtSrlJjbLAPLTCxVNSCho44aMTEKNjii+POW l5kB/tngNLNfGqp2mXP5yibA5CJiIwqul513oOaTCe6Ov9E9e4483exixsfwnnxw+/pU 0l3igFZWtz4aHe5pEngAkvU38RrKK60Iyr3twwG3SIiIrcrRshKwNtDMxigXc11gR3OP AFJ3QsP6/LMNU+BtVjq9/MkXtOZs8RHgjBsHwXTsSbXSHk6GZE0ZYS2Jui/21/sQLvX8 gmL20DnU82a3eC46e4/9+aLBax/BJK9xwNds9YvIut/I5jsOSke04REYV/UYYXUw7462 TqSA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=F7tGUbYrO0LaqqLDslIXG8EpJYmwDVj8pxAuB9hurBw=; fh=qXa24zayXOYlKZVel/hFKkPEFV7hcsZXa/neyQDqTUg=; b=dqTU1u4STzN9vP6PzwP1WbYqeiPwbjK9I7mkwlM7tw/65W4vqgbllnkO4LB1CfJ/7s GLSn/2lpw2Eudnisxv4vcAN6iI5hGOSMHj0VwK9NK54pLvG/mNtKeFWEBEAfiaDChS1D KQoVWdzQozNgagKTD3jY2ETHshNzAuyHk72u5sfAPlcwpCGvK6fByCICPp/kuWztF6kh inRv/YaYgKs2gFFfKfn93Y+ejjCYpAIoXYj9baN+S1JSWSbsX+fUqa4jDngTG6QtiGDs 8AlXvKWrmqUQXdu+wMf4aX/exDO1vNjxSYA/IRPL5fP3VxMTa2jMGekPEnxGSVKTdB33 f+RQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=jmn+rSKV; arc=pass (i=1 spf=pass spfdomain=canonical.com dkim=pass dkdomain=canonical.com dmarc=pass fromdomain=canonical.com); spf=pass (google.com: domain of linux-kernel+bounces-64748-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64748-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com X-Forwarded-Encrypted: i=2; AJvYcCWJmbsPFmfX8t5jCnmXpD3mdJY8YyYyy60d/5/nyi/hFAjZE21rRsbE9ZqdzZUQN/GdnJE2j8W5H6aUBGSOh5mmrklW6Q== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id qa31-20020a170907869f00b00a3886e07813si2073390ejc.679.2024.02.13.21.25.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 21:25:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64748-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=jmn+rSKV; arc=pass (i=1 spf=pass spfdomain=canonical.com dkim=pass dkdomain=canonical.com dmarc=pass fromdomain=canonical.com); spf=pass (google.com: domain of linux-kernel+bounces-64748-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64748-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id ECF931F23DF0 for ; Wed, 14 Feb 2024 05:25:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6721410A11; Wed, 14 Feb 2024 05:25:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="jmn+rSKV" 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 3EFA510A01; Wed, 14 Feb 2024 05:25:23 +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=1707888327; cv=none; b=ALeoEngWsaYOHbLxy32XnlNz7YVqg3VP3svVzMu5a2gTI5ed+GcPIhruDTpyS0Qmov/S9ilI0ctBhKb9ikqfQo/kxfS7mGoPdKTiuVGMIo5rH4QqvwbbCVfDpKXZRJe6a/XRAy91/B+xQR4tL6bR9nJvh3Lg5mbfbZn605hE2d8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707888327; c=relaxed/simple; bh=/SNJH5mi3cLJUn0gkt7Dk+vu0AREXHUs/+p3bdoRMj8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=prWWnvsh2ZbBUpO3b2gSTrxoqkpiUrGmyXufOgEWGJtH9L0OCtpIS5uA+MvoVcR64XThXb0j5AE27s1ExV6iaGS1oYekOKszjG6PGBlXG6/X2aUl/mnTe+75m0+SDiZKRyC+QrKJ0ye19L6NUJ6oDBOCQaftaihWQlyBxWhok3E= 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=jmn+rSKV; 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 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 6213043A13; Wed, 14 Feb 2024 05:25:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1707888320; bh=F7tGUbYrO0LaqqLDslIXG8EpJYmwDVj8pxAuB9hurBw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jmn+rSKV1GWw4BbgEKt8LV0gNWtSCrzaGYl4SnNBs2cJc0IEZ4eWfCctqqyFJxbw/ mbdu/f/ACZQSi11bX5Me0YKaPIIT2/VNp2nAB5GkytNwkvtnZuKDvIdswItJK1WhPz 4yn8Wi7iWb3Vi/4/UxzLO/mlokW6YDLZVN5rLeTM6z46xBtMHs62bMf0LY4SrPuiMC iBEKbjZ4gp+jCKngdWFB9EI1VEpjnYLcXg1EwgX4iDO8RJxwFjeAkTq4Yox11zfhC6 pnsv7zgs1a5gbeN0oJc6dHTE3VIHF/CHCfvjT1ggMLYbrgMZue6rXJrSNOKgko+x/6 Q0TQjSF2rf6Bg== From: Daniel van Vugt To: Cc: Daniel van Vugt , Mario Limonciello , Greg Kroah-Hartman , Helge Deller , Daniel Vetter , =?utf-8?q?Th?= =?utf-8?q?omas_Hellstr=C3=B6m?= , Jani Nikula , Maxime Ripard , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/2] fbcon: Defer console takeover for splash screens to first switch Date: Wed, 14 Feb 2024 13:24:07 +0800 Message-ID: <20240214052412.22770-2-daniel.van.vugt@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214052412.22770-1-daniel.van.vugt@canonical.com> References: <20240214052412.22770-1-daniel.van.vugt@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789777232791267970 X-GMAIL-MSGID: 1790850732794960859 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 the command line for the expectation of userspace splash and if present then extend the deferral until the first switch. v2: Added Kconfig option instead of hard coding "splash". v3: Default to disabled, not "splash". If enabled then take over on switch rather than on first output after switch. Closes: https://bugs.launchpad.net/bugs/1970069 Cc: Mario Limonciello Signed-off-by: Daniel van Vugt --- drivers/video/console/Kconfig | 12 +++++++++ drivers/video/fbdev/core/fbcon.c | 44 +++++++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index bc31db6ef7..2f9435335f 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -138,6 +138,18 @@ config FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER by the firmware in place, rather then replacing the contents with a black screen as soon as fbcon loads. +config FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER_CONDITION + string "Command line parameter to defer takeover to first switch" + depends on FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER + default "" + help + If enabled this defers further the framebuffer console taking over + until the first console switch has occurred. And even then only if + the specified parameter is found on the command line. This ensures + fbcon does not interrupt userspace splash screens such as Plymouth + which may be yet to start rendering at the time of the first console + output. + config STI_CONSOLE bool "STI text console" depends on PARISC && HAS_IOMEM diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 1183e7a871..e5d841ab03 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" @@ -3348,7 +3349,7 @@ static int fbcon_output_notifier(struct notifier_block *nb, { WARN_CONSOLE_UNLOCKED(); - pr_info("fbcon: Taking over console\n"); + pr_info("fbcon: Taking over console for output\n"); dummycon_unregister_output_notifier(&fbcon_output_nb); @@ -3357,6 +3358,27 @@ static int fbcon_output_notifier(struct notifier_block *nb, return NOTIFY_OK; } + +#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER_CONDITION +static int initial_console; +static struct notifier_block fbcon_switch_nb; + +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) { + pr_info("fbcon: Taking over console for switch\n"); + dummycon_unregister_switch_notifier(&fbcon_switch_nb); + schedule_work(&fbcon_deferred_takeover_work); + } + + return NOTIFY_OK; +} +#endif #endif static void fbcon_start(void) @@ -3368,8 +3390,18 @@ static void fbcon_start(void) deferred_takeover = false; if (deferred_takeover) { - fbcon_output_nb.notifier_call = fbcon_output_notifier; - dummycon_register_output_notifier(&fbcon_output_nb); +#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER_CONDITION + if (cmdline_find_option_bool(boot_command_line, + CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER_CONDITION)) { + initial_console = fg_console; + fbcon_switch_nb.notifier_call = fbcon_switch_notifier; + dummycon_register_switch_notifier(&fbcon_switch_nb); + } else +#endif + { + fbcon_output_nb.notifier_call = fbcon_output_notifier; + dummycon_register_output_notifier(&fbcon_output_nb); + } return; } #endif @@ -3416,8 +3448,12 @@ 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); +#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER_CONDITION + dummycon_unregister_switch_notifier(&fbcon_switch_nb); +#endif + } console_unlock(); cancel_work_sync(&fbcon_deferred_takeover_work);