From nobody Mon Dec 1 23:06:22 2025 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B394633F8B4 for ; Wed, 26 Nov 2025 16:09:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764173361; cv=none; b=d+0sK0rEftXwbVx/Ve51MBXx4GvlKBzpCUuHicaRJ5XflFei03x4QKkYm0decHzA9ge+sI2KvVZc/YA6RXq7NjuT3Fpf+AoGOC8zICa6xi+ETzjXpCP9cqLZyyif86Hp7MJlVPOrvlCeGfgYy60zseMMMoPeFwCEd12Pi9tNGLE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764173361; c=relaxed/simple; bh=U7tFcnO2afR5bFpuA3GQbDeppJdyAIhhI4v+VmjjLvI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vo61S3dnsbp6K4IrKcsjHJKt/27OVQ0/db8lF3cWuMR2RRsgXMX8+RkLAeDPhtlpQ7P9VrAbj41LCz0mbgB/lsEgvyBAin7Z73acIpqfXOqK8iOgGnAOu42C64TWXUxhQhyemEpp74800wjUc/hsPzH+B+sLhkz9N3qZeYxfD2U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=sPkIenej; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=kM8HVdyM; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=sPkIenej; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=kM8HVdyM; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="sPkIenej"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="kM8HVdyM"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="sPkIenej"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="kM8HVdyM" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 48E6D336F2; Wed, 26 Nov 2025 16:09:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764173342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=np/o9SOrUSR89NMerp0bJqsfAGpMRXdw2KZq5Jl7t3Q=; b=sPkIenejRUDLewaW3vnNRqaw7t86Ma99tLNBzMYYlMSwKwwoZKzKjAOa0TZ9X+fQM1t0xf RjrUGb9hpGyNBogufJJLumbgplcPn9Zd8xSZwNyOm4DhBOWe/yPcsAI2YxL9GOkeZbSna3 4E2P5U8/eyITwhnqFZ25AN1sO+Av6cE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764173342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=np/o9SOrUSR89NMerp0bJqsfAGpMRXdw2KZq5Jl7t3Q=; b=kM8HVdyMpjcj6DidHZKS96kdXotXOFf0rAPcZ2oV9IXUcgDW70OhSUtuigzKx0HsVah9iF snPjYLQ2oqMladBw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=sPkIenej; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=kM8HVdyM DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764173342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=np/o9SOrUSR89NMerp0bJqsfAGpMRXdw2KZq5Jl7t3Q=; b=sPkIenejRUDLewaW3vnNRqaw7t86Ma99tLNBzMYYlMSwKwwoZKzKjAOa0TZ9X+fQM1t0xf RjrUGb9hpGyNBogufJJLumbgplcPn9Zd8xSZwNyOm4DhBOWe/yPcsAI2YxL9GOkeZbSna3 4E2P5U8/eyITwhnqFZ25AN1sO+Av6cE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764173342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=np/o9SOrUSR89NMerp0bJqsfAGpMRXdw2KZq5Jl7t3Q=; b=kM8HVdyMpjcj6DidHZKS96kdXotXOFf0rAPcZ2oV9IXUcgDW70OhSUtuigzKx0HsVah9iF snPjYLQ2oqMladBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D3BE53EA63; Wed, 26 Nov 2025 16:09:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gPp/Mh0mJ2lnIgAAD6G6ig (envelope-from ); Wed, 26 Nov 2025 16:09:01 +0000 From: Thomas Zimmermann To: ardb@kernel.org, javierm@redhat.com, arnd@arndb.de, richard.lyu@suse.com, helgaas@kernel.org Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org, linux-fbdev@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 6/9] sysfb: Move edid_info into sysfb_primary_display Date: Wed, 26 Nov 2025 17:03:23 +0100 Message-ID: <20251126160854.553077-7-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251126160854.553077-1-tzimmermann@suse.de> References: <20251126160854.553077-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCPT_COUNT_TWELVE(0.00)[16]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received,2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLtfyjk8sg4x43ngtem9djprcp)]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:mid,suse.de:email,suse.de:dkim] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 48E6D336F2 Content-Type: text/plain; charset="utf-8" Move x86's edid_info into sysfb_primary_display as a new field named edid. Adapt all users. An instance of edid_info has only been defined on x86. With the move into sysfb_primary_display, it becomes available on all architectures. Therefore remove this contraint from CONFIG_FIRMWARE_EDID. x86 fills the EDID data from boot_params.edid_info. DRM drivers pick up the raw data and make it available to DRM clients. Replace the drivers' references to edid_info and instead use the sysfb_display_info as passed from sysfb. v2: - drop changes to CONFIG_FIRMWARE_EDID Signed-off-by: Thomas Zimmermann Acked-by: Arnd Bergmann Acked-by: Ard Biesheuvel --- arch/x86/kernel/setup.c | 6 +----- drivers/gpu/drm/sysfb/efidrm.c | 5 ++--- drivers/gpu/drm/sysfb/vesadrm.c | 5 ++--- drivers/video/fbdev/core/fbmon.c | 8 +++++--- include/linux/sysfb.h | 6 ++++++ include/video/edid.h | 4 ---- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 675e4b9deb1f..d9bfe2032cd9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -215,10 +215,6 @@ arch_initcall(init_x86_sysctl); =20 struct sysfb_display_info sysfb_primary_display; EXPORT_SYMBOL(sysfb_primary_display); -#if defined(CONFIG_FIRMWARE_EDID) -struct edid_info edid_info; -EXPORT_SYMBOL_GPL(edid_info); -#endif =20 extern int root_mountflags; =20 @@ -530,7 +526,7 @@ static void __init parse_boot_params(void) ROOT_DEV =3D old_decode_dev(boot_params.hdr.root_dev); sysfb_primary_display.screen =3D boot_params.screen_info; #if defined(CONFIG_FIRMWARE_EDID) - edid_info =3D boot_params.edid_info; + sysfb_primary_display.edid =3D boot_params.edid_info; #endif #ifdef CONFIG_X86_32 apm_info.bios =3D boot_params.apm_bios_info; diff --git a/drivers/gpu/drm/sysfb/efidrm.c b/drivers/gpu/drm/sysfb/efidrm.c index 29533ae8fbbf..50e0aeef709c 100644 --- a/drivers/gpu/drm/sysfb/efidrm.c +++ b/drivers/gpu/drm/sysfb/efidrm.c @@ -24,7 +24,6 @@ #include #include =20 -#include