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: 195706 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp295309dyc; Fri, 2 Feb 2024 00:57:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0NKhI/1JDroQ7VONz9zimPibyL4GRji8SEwL6ewfQE81ziY+2XXXuDgDJ7DEyz7ZQmC+2 X-Received: by 2002:a05:620a:a94:b0:785:3cf9:7f55 with SMTP id v20-20020a05620a0a9400b007853cf97f55mr5067881qkg.48.1706864220652; Fri, 02 Feb 2024 00:57:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706864220; cv=pass; d=google.com; s=arc-20160816; b=AntEvgLPa71ZZnHdmiuXMjcK/TyGLl9HXzJG6GVCINwui06TLq8rt0Nqj5lpUMjHet Xn+ckNCNPxAedkn/UwCR+eXxsvNPw2d8WMLkwR7NvR5zPqVWY4RDmppySY0Qb9wLqeq6 PHumUxbyA9ik/08ccmx0F+q6JWJ7CPrBu0AGKfUXBZwZvhfbfuzKcKmje3NdwozNE5z9 ks8E9nIvQEftRiZjxsOXoHTtao/oZIP6TKp7EPgOMaEHMD0rIszRqm6VwsSZSkwlkFaW VEg22CRExV1qKQUmo1eunuyzEq4MeK9IWhheg8GOmt6QciYDWYsKrW0vwDtBotDJ15WX gn4g== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=qrYMi74bcCPFGEWKyxCuYJeZThHsF8LjYHDib4wabmI=; fh=P50aIrT90Cm6YvLGtIySjbSCznaqFlfFaZgX8DUETfo=; b=V4z+hDovFjPihCqP1e8B32fcKVqEE455KHvKH4i8FykUJWCKIYzCRqLcF+it2SRhLQ ImW3kG5nDq3u80Mz2ytclR2BdAO6iwuH+Xs56OtCh14ENNogHzKliOVQ1Le4t0FmUiwm 8nhZuzb14aMAfFbtv4F7h/yABex2YjhXwMHOXIBFBlrv0cMXWoXPDloe1Bq0FhQJOeKu o74KTHOQnjEiFpHDZynbnlcSMkhJcgzsxns8MVpU8GPFd5N0YxayYPtUHoPGGtIM0Zud riejsdnj+MbesN4wUIZjCyjixPbupY8JoZA4N3Fy56lRgvwe/p3W1+RL3ZOVwUDU9pXk Sgqg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=U8UqnvCa; 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-49511-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49511-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com X-Forwarded-Encrypted: i=1; AJvYcCVo99VTZ0CjK0+S1gPeqGyqu2ODseNKUfoZZtHwLMLgatxrkXQp4vkJKIQYf32kmyHHeSY5tRgkRFE6lBmRUYiebRHfNA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id bk9-20020a05620a1a0900b00783636cd0e4si1678803qkb.780.2024.02.02.00.57.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 00:57:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49511-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=U8UqnvCa; 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-49511-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49511-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 9A55E1C253D9 for ; Fri, 2 Feb 2024 08:55:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CB0BF60893; Fri, 2 Feb 2024 08:55:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="U8UqnvCa" 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 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789776856583953667 X-GMAIL-MSGID: 1789776856583953667 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: 195711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp298097dyc; Fri, 2 Feb 2024 01:02:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbdUo5usmhKLe7X65sSm+89xau/zQyCANx7bRVJJV8ZlWpvkHDO0NTHeA2WIiaJlo2Dx6s X-Received: by 2002:a05:6358:904b:b0:178:70ac:5a4f with SMTP id f11-20020a056358904b00b0017870ac5a4fmr8017462rwf.27.1706864578703; Fri, 02 Feb 2024 01:02:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706864578; cv=pass; d=google.com; s=arc-20160816; b=ZIZceZbBnDwJu+ak8UgxmpVQNrz2oJzGonk8wvBk5m/7rRLSqOjgBHzsdKe/XR4b7L EjkY235EtOMMjm8wxlFbIZkfufQw/ugGNbfPobeUlkIXj5ccYza5jwSt9eXS9fOcBuCK 7sy1G3sblRAfos5G1X9RFPZy909smQsJMAJ9eqlOXM2ElELAZaorFCovDTMqdk9HVE1w lSrajB1UIUaVKIanhgOj00uzBgzX1FaH5WWKhAfRpVwI0jN/koKJG396cey2tNlHFQOK UQ1F6pc/7582frLRApd/3LOYWx36Mbfz2PtIuZ3nXdZgPZYoxgDZzTxzG0LXC+RmMtir t6Aw== 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=9y1paqiSjtE07Weh2QloWiCQOyB0q+cBO1seRMkGQ5U=; fh=OCysyjNjDae4U3xYPCiX3kh1WBjEGSrbn+6p2qLmFE8=; b=PQYjaFygCWRq31XbXDgBcbwS8afkvIXFu6jKAWp2u5XFVrsV9lqgt/SX0Go2kgioPx 1vvk633sC+0fDKNSFMgDYMEqTL2WTZLEuSexmwAYmT7iG0I9KBZAArRK9IcbjxWXr0Bw vHH7OVKYR6c42URBkjVY8HXu0PqjLWocrQ1RZm7F4MzyFjK4It5yweJU6Jn39V28Jujy pcLSv1p9k/u/44gpgQJPN8ueC5t1sIlv/qO8oIPfSKm85mh23N7pCRF2aO1a6AnoSvLI Bf15qmJ2eFClgtMdpGSJGoFcwCR/r5EhzbSzq9WjgxOFQXozpuQxVeEUpGSXov3hluiB nkpA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=jSwxgw1o; 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-49513-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49513-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com X-Forwarded-Encrypted: i=1; AJvYcCX+56GjGw6ocR0zwZDJjcmuv77pU8oz0L0hyOqjYEymJRmvUxRjeSqa+CcO8fHiEFn+98pOKpmf/U8rLbV2Ek2Tj7Sfxg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id h4-20020a63f904000000b005d747b7058fsi1200721pgi.778.2024.02.02.01.02.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 01:02:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49513-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=jSwxgw1o; 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-49513-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49513-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 3231C291B60 for ; Fri, 2 Feb 2024 08:56:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 318C160DC6; Fri, 2 Feb 2024 08:55:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="jSwxgw1o" 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 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-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: 1789777232791267970 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);