From nobody Tue Dec 2 02:29:52 2025 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 CB2E63596E0 for ; Wed, 19 Nov 2025 12:30:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763555428; cv=none; b=qieo+yY/nPVF3R/eqQTZrTJ1shlEexslhvGnH92qd7yWOUeN5QCVrmtEXBvGUdxUEE5TLXzQk3k6CpLFAvtuecbfLgYVMRKh0hu68MgIs3cI+mr6sZgmCOeoGQ4EJUMtMDRymN+8PnOQ8PdymcNRu1YwAY9SGln6V5vejBmOpQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763555428; c=relaxed/simple; bh=byDZ3v7t+CCsOFWDfG4hKIJVO8uBoCLKg3FIfkOxduU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Nhr7+t+cNEAuuGYmWtrdj0uTcMd06SFeyV3fFl6Ph1QcI3gYjLa/z/Sc+0Wka72guonKQ4GO/pzN3gyd12PaqKhO//2+CdnH1qPfOGupRIzDLWMPtPHMIipAxbIJX6qMrxJjub7RE8uW09XI/0zQyVH3ZmdRjCKpHfGSG/aPSco= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=rd+d8Imb; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rd+d8Imb" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-477a11d9e67so25379885e9.2 for ; Wed, 19 Nov 2025 04:30:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763555422; x=1764160222; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=UsBDJIWJ97vXgpwIuKapIs2CJoKu+mSgcIX0r/Bn/YA=; b=rd+d8ImbdBrxhe2+2VD1PfJlc1kekXApVGL6Je8V9GH0sY5vUUYz9ucMncFDsWSigG lsZLXL/l5Q8clOFrNfy49f1wDcInVjEx95JAE0Cq62VHz4abRuT+T3x6IqC0tFvRf8xf 9G/ol9q9a56SPUuBF6ZPJSgy7MtLJ3nbu1qb97JLbSXggNKUqIGneIVKujFV/BwlLXcR QK77c+0p91k63h4kiWifuBwpczF/Ji3QMO6Naj/BUynYSoxrogk5MfR8HcvsL8UOx/jC UaLHgNnFMijN0D8BtdQlZAxhaoQ2ByoEiVW+vjELNMfKNjFwdi5eRatGuayD4RB7nSmg Ombg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763555422; x=1764160222; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UsBDJIWJ97vXgpwIuKapIs2CJoKu+mSgcIX0r/Bn/YA=; b=aTRgSEhIjW4y2ks60vsE9g+bdryjbTh+7cthJWB9Nk1AaOyrQiZqsKz6axTHDUnhBQ eZ7bxcnwIlVmZEdgS0+ZbV8mh2jfHLm0547NxHnK0CH3cZ9DDFBDTjvD4bLse05u/X2q 9V0INJGdmawN+hznIoweCssnt7acMfGPKuD4Oqin43s/9n52/OvkHWYZGakx85OeWzFH nbkQj89mg/HZVsSi3BolDcRdEC00FaCNDKTWTxu1ObFiCwukOHUhakvJelKBTkQHclCf YozAsYdkv0O0PLJbv0NUOZ7qKc/+uM/mXf3s/ivO6HgCJ0Hz+OE0vkk7Mdq9XMIWXYct p6aw== X-Gm-Message-State: AOJu0YzrD6bW3ID1tEXkYVvtUsRGS/BvLIW2UirlvDeBZpXkM3Wnx0Ls s+dGazEaaY4IEA13w4dXEpxRFR9+tQNe6Xj+5BxhmVoDAm5WSthcaP9I0CptiflxztUehZ+TzA= = X-Google-Smtp-Source: AGHT+IGfHs868menOEt0jF3zDpOrJd8v4sXY1quT2LiSrNKCB4Qfy3GPRP30bJNkIHh/MXZJdQvXrkMQ X-Received: from wmbgz4.prod.google.com ([2002:a05:600c:8884:b0:477:40c1:3e61]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1f91:b0:475:dd9a:f791 with SMTP id 5b1f17b1804b1-4778feadab1mr170191055e9.28.1763555421842; Wed, 19 Nov 2025 04:30:21 -0800 (PST) Date: Wed, 19 Nov 2025 13:30:14 +0100 In-Reply-To: <20251119123011.1187249-5-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251119123011.1187249-5-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=3657; i=ardb@kernel.org; h=from:subject; bh=hApARYQFN8XsOp7qFZrUlKVZ7kI6zgBzSlJESx8C/zE=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIVN2R/iLd8fncS9abj3Z73lP94f/ukrf2E7lHHt7OZc7t H/H/Lq3HaUsDGJcDLJiiiwCs/++23l6olSt8yxZmDmsTCBDGLg4BWAij0wZGV6skHpzYvf9Rib7 sLLtbguWTGOXLXisk6MpmRJhGxXad4Lhr+SpXZxy+/fqc35618Zzp/oVTwProqUR6UsOXTogP+v zBX4A X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog Message-ID: <20251119123011.1187249-7-ardb+git@google.com> Subject: [PATCH 2/3] video/edid: Use getter function for edid_info From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , Thomas Zimmermann , Javier Martinez Canillas Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ard Biesheuvel Avoid accessing a global writable buffer directly for edid_info, and instead, define a getter function returning a pointer to it. And considering that all callers access only the 'dummy' field, just return a const u8* directly. This will be used by non-x86 EFI systems that pass edid_info via a EFI configuration table. Signed-off-by: Ard Biesheuvel --- arch/x86/kernel/setup.c | 8 ++++++-- drivers/gpu/drm/sysfb/efidrm.c | 4 ++-- drivers/gpu/drm/sysfb/vesadrm.c | 4 ++-- drivers/video/fbdev/core/fbmon.c | 4 ++-- include/video/edid.h | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 1b2edd07a3e1..526c9c4553c1 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -214,8 +214,12 @@ arch_initcall(init_x86_sysctl); struct screen_info screen_info; EXPORT_SYMBOL(screen_info); #if defined(CONFIG_FIRMWARE_EDID) -struct edid_info edid_info; -EXPORT_SYMBOL_GPL(edid_info); +static struct edid_info edid_info __ro_after_init; +const u8 *get_edid_info(void) +{ + return edid_info.dummy; +} +EXPORT_SYMBOL_GPL(get_edid_info); #endif =20 extern int root_mountflags; diff --git a/drivers/gpu/drm/sysfb/efidrm.c b/drivers/gpu/drm/sysfb/efidrm.c index 1883c4a8604c..e30b93ed4264 100644 --- a/drivers/gpu/drm/sysfb/efidrm.c +++ b/drivers/gpu/drm/sysfb/efidrm.c @@ -203,8 +203,8 @@ static struct efidrm_device *efidrm_device_create(struc= t drm_driver *drv, &format->format, width, height, stride); =20 #if defined(CONFIG_FIRMWARE_EDID) - if (drm_edid_header_is_valid(edid_info.dummy) =3D=3D 8) - sysfb->edid =3D edid_info.dummy; + if (drm_edid_header_is_valid(get_edid_info()) =3D=3D 8) + sysfb->edid =3D get_edid_info(); #endif sysfb->fb_mode =3D drm_sysfb_mode(width, height, 0, 0); sysfb->fb_format =3D format; diff --git a/drivers/gpu/drm/sysfb/vesadrm.c b/drivers/gpu/drm/sysfb/vesadr= m.c index 16a4b52d45c6..a4ff78fddc0c 100644 --- a/drivers/gpu/drm/sysfb/vesadrm.c +++ b/drivers/gpu/drm/sysfb/vesadrm.c @@ -469,8 +469,8 @@ static struct vesadrm_device *vesadrm_device_create(str= uct drm_driver *drv, } =20 #if defined(CONFIG_FIRMWARE_EDID) - if (drm_edid_header_is_valid(edid_info.dummy) =3D=3D 8) - sysfb->edid =3D edid_info.dummy; + if (drm_edid_header_is_valid(get_edid_info()) =3D=3D 8) + sysfb->edid =3D get_edid_info(); #endif sysfb->fb_mode =3D drm_sysfb_mode(width, height, 0, 0); sysfb->fb_format =3D format; diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fb= mon.c index 0a65bef01e3c..caa057c76a88 100644 --- a/drivers/video/fbdev/core/fbmon.c +++ b/drivers/video/fbdev/core/fbmon.c @@ -1495,7 +1495,7 @@ const unsigned char *fb_firmware_edid(struct device *= device) { struct pci_dev *dev =3D NULL; struct resource *res =3D NULL; - unsigned char *edid =3D NULL; + const unsigned char *edid =3D NULL; =20 if (device) dev =3D to_pci_dev(device); @@ -1504,7 +1504,7 @@ const unsigned char *fb_firmware_edid(struct device *= device) res =3D &dev->resource[PCI_ROM_RESOURCE]; =20 if (res && res->flags & IORESOURCE_ROM_SHADOW) - edid =3D edid_info.dummy; + edid =3D get_edid_info(); =20 return edid; } diff --git a/include/video/edid.h b/include/video/edid.h index c2b186b1933a..b8f24c4b2829 100644 --- a/include/video/edid.h +++ b/include/video/edid.h @@ -5,7 +5,7 @@ #include =20 #if defined(CONFIG_FIRMWARE_EDID) -extern struct edid_info edid_info; +const u8 *get_edid_info(void) __attribute_const__; #endif =20 #endif /* __linux_video_edid_h__ */ --=20 2.52.0.rc1.455.g30608eb744-goog