From nobody Tue Dec 2 02:29:52 2025 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 66BFE35CB70 for ; Wed, 19 Nov 2025 12:30:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763555428; cv=none; b=L/jKGpNza4NmBU47hekMOQLRDx8/BsQK/vg65R7hpUE/ndGgSm/s/onVK7l1MIxxHojebDTd1KX2YcKSjL6qhE34u8PQJvOVgQm/vm6+6dlr2JKJOlDK7leibBq1VbQys44QkC2/5T2VVKCIbGmwmKN/Ygwk8bcJjsRdfeqfnbg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763555428; c=relaxed/simple; bh=sOiJLEccJubY+IlNedE4v53cBZq+vCu9Z/9uV/ZRZJE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=n/y4bJ2frw8gC8jjVxkBf0gk0ufBTZq1eE/0GfgDFtSaM3ffaqS9l4ARC3fHT4kiqhgh8Gqj+5jW/Xosq1zZb8ZXhLHgbdSeipTOTlea+dOk7E2kbD0Ds5iaQ7hTDEpO4jCQotAodTDgJ12hNoj+Y8GS9Uisl/NoWDs3rJSMVdE= 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=ybrhDenc; arc=none smtp.client-ip=209.85.221.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="ybrhDenc" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-42b3b5ed793so6636548f8f.2 for ; Wed, 19 Nov 2025 04:30:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763555423; x=1764160223; 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=CCZSFlWjXSemPE0c71hVyq0rOCAzcBUbpMNTNmmBAhI=; b=ybrhDencEo5SwqJX8xEaU6dMyZ8JVRfSwA2eH4voxK12WUFuA0h3XU3F+q9Dfidpie vMI+xJ0/7AscT9IAekteRSNxAa+Z3q7QMu3RhZKUp/9vmBgfij3Tz4NkqfXwsEon5dVU MJjA8yDUnYDV/X+brql3lge5sfBOuyrySyag5lQQ7pcQIRulDMhyyKT4RLehAQxZr3tz Ep2ly+N9zPyLV5tBBMnlf/TV/llyLycEi7voVNotVcTwbcJLoM9CTjivzIX/4uwQsweD uyoJUQaI9YMPoQJPe7Gvulx/X/WwyZa5w7obv5hloxOjYB0DheTcOijmrhwf2DxRtwQ1 Ms0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763555423; x=1764160223; 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=CCZSFlWjXSemPE0c71hVyq0rOCAzcBUbpMNTNmmBAhI=; b=NUIb9C33DZ//umrDieG5Vk3dPgba6YvbSmSCRZtcgFewBYYTGjMKIPLAQcYgAty1XT IGPTke+bSNWwbvjtb4saoWm91n5LrWIRxvcNhvtGNMG4Ipqa5QIsRrNwMqi8npgBoT2v w0+lIyvnuts/nLYn+SPdLpccCduOJin+tPjAkpBQaQJeoKayBcPAd42/IyNekiVAxusi 9bIh8gSfUhp0501FS9hIGGxlztf3ry7Fc3Qs7uqXcRAPQFai8RTfKrTW4f+qdM4/EQ81 hIuxd9fx6qo5AZ3/V5igmEiwU/UGjsDPVDaqEIC3rXP1WOiHhx+uUGqiT1IOJvbw0BxW IvHQ== X-Gm-Message-State: AOJu0YxAd/zyCe/nBFol0vcFWjXOcNdnIEw6SOG6KYgpKGTt4di6E+3C 9PxIcW++oreIL/fOso4JkXHDy4Lydi2Z5NVyObutzcE+Bmie9c/bR3SxKrKbEJog3s6rUITZAw= = X-Google-Smtp-Source: AGHT+IEbIoEW04wIIITxvn25xflZHV3gl+MhgBXd8EGgAT69kGiOFtZFawgeYZEZSMbsl50CtoUIe7+n X-Received: from wros1.prod.google.com ([2002:adf:ecc1:0:b0:42b:b28a:6751]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2087:b0:42b:30d4:e401 with SMTP id ffacd0b85a97d-42b5933e396mr21516548f8f.12.1763555422909; Wed, 19 Nov 2025 04:30:22 -0800 (PST) Date: Wed, 19 Nov 2025 13:30:15 +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=3278; i=ardb@kernel.org; h=from:subject; bh=qs6TD8wDZN1H8XJtFf3OJxiLamhf33ZUemAhFwhVlgo=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIVN2R8TU4yzi2t2Rmlu9dwhP/xcteN+L89PrhxHbnaV0N QRdHXd2lLIwiHExyIopsgjM/vtu5+mJUrXOs2Rh5rAygQxh4OIUgImYXmZkuFpteI4laJd49Ynm Q++2r7HbJp5YLH/j6YnlDzVS7bffkmP4n+Fgznss+ZX/o/9Sx6PD5CfVf3hq4yamfPihvkmY2yU NfgA= X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog Message-ID: <20251119123011.1187249-8-ardb+git@google.com> Subject: [PATCH 3/3] efi: Add FIRMWARE_EDID support 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 Add support to non-x86 EFI systems for passing the EDID information discovered by the EFI stub to the kernel proper. Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/efi-init.c | 8 ++++++++ drivers/firmware/efi/libstub/efi-stub.c | 7 ++++++- drivers/firmware/efi/libstub/efistub.h | 3 --- drivers/video/Kconfig | 2 +- include/linux/efi.h | 4 ++++ 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-ini= t.c index 5896f4e699a1..d70bd0ec154f 100644 --- a/drivers/firmware/efi/efi-init.c +++ b/drivers/firmware/efi/efi-init.c @@ -64,6 +64,14 @@ struct efi_screen_info efi_screen_info __section(".data"= ); =20 extern struct screen_info screen_info __alias(efi_screen_info); EXPORT_SYMBOL_GPL(screen_info); + +#ifdef CONFIG_FIRMWARE_EDID +const u8 *get_edid_info(void) +{ + return efi_screen_info.edid_info.dummy; +} +EXPORT_SYMBOL_GPL(get_edid_info); +#endif #endif =20 static void __init init_screen_info(void) diff --git a/drivers/firmware/efi/libstub/efi-stub.c b/drivers/firmware/efi= /libstub/efi-stub.c index fe77c285a547..20b606d1cbf0 100644 --- a/drivers/firmware/efi/libstub/efi-stub.c +++ b/drivers/firmware/efi/libstub/efi-stub.c @@ -54,8 +54,13 @@ void __weak free_screen_info(struct efi_screen_info *si) static struct efi_screen_info *setup_graphics(void) { struct efi_screen_info *si, tmp =3D {}; + struct edid_info *edid_info =3D NULL; =20 - if (efi_setup_graphics(&tmp, NULL) !=3D EFI_SUCCESS) +#ifdef CONFIG_FIRMWARE_EDID + edid_info =3D &tmp.edid_info; +#endif + + if (efi_setup_graphics(&tmp.screen_info, edid_info) !=3D EFI_SUCCESS) return NULL; =20 si =3D alloc_screen_info(); diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/= libstub/efistub.h index bdeb28d42a1a..93940592e88e 100644 --- a/drivers/firmware/efi/libstub/efistub.h +++ b/drivers/firmware/efi/libstub/efistub.h @@ -34,9 +34,6 @@ #define EFI_ALLOC_LIMIT ULONG_MAX #endif =20 -struct edid_info; -struct screen_info; - extern bool efi_no5lvl; extern bool efi_nochunk; extern bool efi_nokaslr; diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index d51777df12d1..6526827fbc55 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -63,7 +63,7 @@ endif # HAS_IOMEM =20 config FIRMWARE_EDID bool "Enable firmware EDID" - depends on X86 + depends on X86 || EFI_GENERIC_STUB help This enables access to the EDID transferred from the firmware. On x86, this is from the VESA BIOS. DRM display drivers will diff --git a/include/linux/efi.h b/include/linux/efi.h index 75d05dc1b4ee..8d8228d73585 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -28,6 +28,7 @@ #include =20 #include +#include