From patchwork Wed Feb 14 05:24:06 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: 200813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp1004473dyb; Tue, 13 Feb 2024 21:35:25 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVrNaXc6byyLBiBiHAKP8WA4ThCNT8CtC9PvEnmX9ni2PmETzMr/SEa1K09YQ89hKgEh0JkPFij6wThGhoX/785F9X6Dw== X-Google-Smtp-Source: AGHT+IEwkoPGSR7nLZJiRvWdj+B4ZRUnH0Yb0fEpES8vBEpRvjwftDms00LRQM+9euse2T/CoI8L X-Received: by 2002:a19:7409:0:b0:511:7b38:b7ac with SMTP id v9-20020a197409000000b005117b38b7acmr990990lfe.57.1707888925122; Tue, 13 Feb 2024 21:35:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707888925; cv=pass; d=google.com; s=arc-20160816; b=QMAvfYZkPyD5SCVlu2v8EneRjcMPXjTyggM6bNpxrkR5/iVPmEZU/Qs64VO/VpAvIg eT9BSfJlu3SXsbLS2Gju0OqDk2U8JmnCS7/QYSx8M5tHocDUH8XbYq2BCJSEIY5LjGzY /pistj29aaabHeSG2qBZ0W2GMOXf+WH4y+wKMoC/rbUy9YBj0253lsBmBuopkNq8nY0g HleEdzi82yRGu9W14wnuvQ7CLnxhdYR87Cy2otf93rSuNTlsrcEo/s4VXE53Mg/b3F8C FmqwW06b4+KEsNf7mwSud1md+jiesAufdseYjlvRE/1LDaQGxLe2EWCKodmfs1E0yUH3 /yUw== 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=9/iiiruOrxUcsoU8WidlB5H9OYxycAcToLIANd7YZzk=; b=C3kULL+PVdcfekk+tIqoZWLPEMhr7OqPxt2zZol4zKaMpMPkIO5Fa9Mk8RoyY+2fCy oRBCa8krBLQlB7x4TqgsVJ0tgBdFcDYGdf2InUYA0wf331kADI+oUa5DCQUVgMlfCZbO mViZP0Ywu0FP+7dx+/RYVJFNxtX/i/hXboOTdOD1yz7T770rEmfJMjNwgmha25ys8wSH qUoA5VM0Ub1dBAvJBouymwX6o6EgHj9htIxnBcB4US6BBLIXoSm7S7N1SSiKKFd3HDaM 4M2DbGyUYhda+dDlkGCw+WY0MZ9QDGGo66cYBtBFUPf8WNBj7MlcgpfXobFhuSNNNtWO Kv7g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=Px90Xudt; 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-64754-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64754-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com X-Forwarded-Encrypted: i=2; AJvYcCVbPpNVHl6cvd4WjdC6o9aGpyQP/u+9aA97nRyHhdOK27bD4XXquar5/3WvKCRO09we+5SJ/9mdeiuRZlK8q6ijjv4f4w== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id ca19-20020a170906a3d300b00a3d27e866b3si657486ejb.13.2024.02.13.21.35.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 21:35:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64754-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=Px90Xudt; 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-64754-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64754-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 B285D1F2481D for ; Wed, 14 Feb 2024 05:35:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 40564D2FF; Wed, 14 Feb 2024 05:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="Px90Xudt" 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 CA833C154; Wed, 14 Feb 2024 05:35:04 +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=1707888907; cv=none; b=X87kbpZQUDkwYqRIiP7frlAUOMD2bHkWeV9Q+L9xN3ylIEt8l7YONQG896+MjapTFuyetuEiasva12l1fPUj1JF9wTabAO5NNtxO2NFK9Y6f1tGsHHFe/pxouBffbSb3sdVGN558h/qY+zW4je9+diW15nrW7F1mhb6UHaZQ7Os= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707888907; c=relaxed/simple; bh=CV4GH9UNJ6zNQc6c5xVZP+xrV8bnxAF5VgMaNZ9XGwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OuGKsHFYxs/uNiFm/ZJKkPdHa6Qut29pmuB+ze2pV1QT6jeaZMXlIGm+EKAMlq2x/e0xsh8BfFu9AGWCxy6TFW5zpNzczVmw4wVD7UW0NYvxUxk5uYDoj9PFmzqtjop8+ifyu/dswjGSacjtYYqmfFZeWyowwG3tro62E6jL9KI= 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=Px90Xudt; 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 BEEC53F70B; Wed, 14 Feb 2024 05:24:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1707888299; bh=qrYMi74bcCPFGEWKyxCuYJeZThHsF8LjYHDib4wabmI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Px90XudtIw8G/nXpr3KPL73tUtf47tJt/JZebPKDpRWH2GNiEwP2Mm/CUybeu9o02 6IdIslOUhot5rKw49c/cYACmlLe1+BOCbuZtnqzmXPLnCkCLquLfR+I7jQB9chpd4s sd6GaOjN/XO6LYhA2h0BvArMIb5DAnV40hpUOfN60j/hbtyzt6IFJ2pRsu3+ynk3bw OZt7NYKZL9DEFqQNbk2ABRdB0lnR8q0NVcq/VAHimC/1e10E/STh5VjU0305cK5lTW 6A2U6xo+um95HDA8VcwCSYs9ajb9oJahvYLVaUpJtMoG3QOyhkkKn6ly9SJFJvhcEl YL39mpzZPKIbw== 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 v3 1/2] dummycon: Add dummycon_(un)register_switch_notifier Date: Wed, 14 Feb 2024 13:24:06 +0800 Message-ID: <20240214052412.22770-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: 1790851337562685554 X-GMAIL-MSGID: 1790851337562685554 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 */