From patchwork Tue Feb 6 10:10:50 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: 197300 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1438284dyb; Tue, 6 Feb 2024 02:12:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IEEnxc6iRF6D6Z5/4RlMtDRSq+RIu4r60/ZqgSZX7NeSDrXckQFY2Wc4+PmhI2LLbxFDu8O X-Received: by 2002:a81:ca53:0:b0:5ff:4c50:1010 with SMTP id y19-20020a81ca53000000b005ff4c501010mr1186655ywk.35.1707214348966; Tue, 06 Feb 2024 02:12:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707214348; cv=pass; d=google.com; s=arc-20160816; b=BC5jOCyd+5OLOOnGeEahi/WDB9SOcu7FGjfFgHQ9w68jAaFW8F6o/rVe6yNjYwlp6t OfJeKVsNUGQq4mhaoR/gw0i9xlz73u/zSpIGMq/Hnyu0qHS0NbLxEf9k6QvPi8XbFrcA waqXfhUivHzyiHZzWUCV9ImixzAr7J1kSVbK54k6b5nFMr0sz0DWoKH2LkR9pQESxCSX bb7RheTXY6jhWhR+tAg/GwbjszIM5Wk1Bx2atIN7H1deynzhfB/SdUl0lz9W/T2iVp4L QdaZBnc4N+bxVnflXXdGkOBpv/0pnWEkafY1roblByx/H4ts6sx2At99KcQ/5ml7THba XLSw== 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=qrYMi74bcCPFGEWKyxCuYJeZThHsF8LjYHDib4wabmI=; fh=PpHsWrLpYs5Tcd6PWCU/vl95jsh9U58RBLqa7Ire6mk=; b=shga9Q4ybT3HYqNV/0/pdpBMnHhdEStwY8GRIBhmpqXFrXxG1fBK0snYI7LscKjDN1 D9zd5h6yap+0Yv8jExYYWYH5DIQCKTL3N7Y0UlymsagNPkTn+eVyyIpY53IsFLgN+XRJ DCH6zv63/3/06TbqLzY57QIlV4/xnugH+YAFSHoUa5UF1oq7FaeGnFJUlicNK3cCWSMv xVWAXHMBptQpri41rS46FumotQ4MPGglL+O/mXPHVu9WwUH9Hogn6/BmcjnfAYDJLgsu pKasvdjimesPEXiF7D4x+DG9rXTZS0gZu2s0EKntA2QbMpOQZbbgN0N9uz8Ne/o5HzrI 9r2g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=pvwpZAYp; 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-54658-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54658-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com X-Forwarded-Encrypted: i=1; AJvYcCUddWtixG1SQDMgz67gQ0vOiE54pCgKJkwsG3763hZLunWyHP/+dF/w/8djrfXOhgSgboEWxhhr1TVe/Jb6fhQGLq2aXw== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id g21-20020ac87d15000000b0042c37a82a24si572979qtb.559.2024.02.06.02.12.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 02:12:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54658-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=pvwpZAYp; 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-54658-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54658-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 B02011C20EEF for ; Tue, 6 Feb 2024 10:12:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AFF9E12E1D9; Tue, 6 Feb 2024 10:12:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="pvwpZAYp" Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) (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 EF42F12D162; Tue, 6 Feb 2024 10:12:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.120 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707214334; cv=none; b=kztEDL/hZ58Dqjqk5A+7nDlHZTjUpiNYXR5OHd3vo7TpLeJ20k7QMfFtGkjLSARLtjhbP4k++GdkFrmM6bhtzJDl9cyQTTb13Y9v8R5EGS/FSQZYVSAnJPMmSr8dh7LKFpigX8WKNA8M4e+19hruxBmitiRBWJ2AuksiXBgGRmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707214334; c=relaxed/simple; bh=CV4GH9UNJ6zNQc6c5xVZP+xrV8bnxAF5VgMaNZ9XGwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tA8KEpdWSNcafioYYmys3oDp23g2oJ8YXCZA39n4Za6Q9x5g3De+X4WDK7qKlb5oq8c+A9ChwcU7bbdngVuqHzmOy1Kc9iASQueQzO8e1rZG/KcQzTu68708+l4davmoLi4Ia76IcMQ1XrlIkdKZc6njJn08Mxr1lv4GXgqmg4k= 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=pvwpZAYp; arc=none smtp.client-ip=185.125.188.120 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-0.canonical.com (Postfix) with ESMTPSA id 2A8513FB19; Tue, 6 Feb 2024 10:11:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1707214322; bh=qrYMi74bcCPFGEWKyxCuYJeZThHsF8LjYHDib4wabmI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pvwpZAYpL7itxwj6MgJbESyF7AQhBzP2KZHOCwoBIe8dEJADO0NNkYpP3PlsljhHk lst+w14GIg0+Dpz/36nj53p1oLYtd5VC/LYz5MWuUeEgu8ba4JLGLoHZKEq+bl7p6a QCogBCbjjK/5a6yhWtNGU0/vOxXCbBpiKq6JuUJGGqG6qDFgtAOs0iBbaiBoh3UsdU PdgekP0s1iugCZzUWitEINb2L0cYNlGXCpUOF3UM7rBK3kUb7kNzBQcbqpRFISmn5G 2Pwn9N23cv7rUx3l4ZfnPZPMbVvCpSx2P7ji6o6WiWLaZzMD/qSh2AQ7ArtAuzTzTv c9yAptHsCJ1rQ== 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 v2 1/2] dummycon: Add dummycon_(un)register_switch_notifier Date: Tue, 6 Feb 2024 18:10:50 +0800 Message-ID: <20240206101100.25536-1-daniel.van.vugt@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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: 1790143993042337096 X-GMAIL-MSGID: 1790143993042337096 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 */