From nobody Mon Jan 12 17:33:11 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dqfbr1Dcwz6Ns6D for ; Mon, 12 Jan 2026 17:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dqfbq5rfxz46qw for ; Mon, 12 Jan 2026 17:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768239191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/n0lQE8pIfQUUSioEjJuzLvaMpM3q3SmKKWozg58dg=; b=E1OVELlg6N0Mf/prjkDZ+w4+qAlVsCVfBIKfBsdQ8JMpCgjpCyclTQX9pXNa96h8X0sE0K Ixf/RGMKR30OXmG2mq2WYhqcd4eY68LBpFUS8THV6jXyB1J6wNP78WOklFGpmXpPiT0CSk HssG30jtPovc6Z7Y5g1asspqirf2m6bUyQvwieOSTkvQn/xxqwYv/Aw5zRS17JQMYRLUvu NUdITF2ikQ/I+HYRKdD5Gpc4ss9Fv0q89RcszRVDopcO9mo4zIN7Guq2rQHOFt8Rq+KheI NOFUC/P1r57g9m04tsmIV5uUcQHy1yhCvoYYDWLRs/CNPXk4LYWHty4Fquev7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768239191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/n0lQE8pIfQUUSioEjJuzLvaMpM3q3SmKKWozg58dg=; b=y1f2vPqQ7NhurhcNCZZ4UWS3ahf34dbjwBdP2w5Noa1DUSEM1pJF58HFw6Rgbv4a1jSTJy IOXBvbDNTlthLki6SXlTalHlJO4lIqQRpVdRBdrKUyMlx0tCCM40WX4i2ULHHFU/duSF7R CPAdnuAXC17Ib/BHOEryWkK+h0/0dymAbPvSBFCEkckncUItq8PuAvij0Jv7Z8mmolsbmq 58satTHQwygnlqMuFYRRjeOVZIHxrkqCejY55ghBESi6ADM6sv2dAbAMjWuVHuRx7Hh6GD e6885xWIOcfmFoDs0pYsDjFwM8EGxalrtYCM809pho51nR64jDV9JN7rccrobQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768239191; a=rsa-sha256; cv=none; b=hCIfIFZ08WpANZJrtYFf7nzlBjN1dyVYznsbKRLFtUrENP66Dge7dNVB0W8ViETpqS5D3Q IGvpZK7hm0nSUH59I3kpAfTtiv0igAWe+Q7Ahm2fw9roAfrqe5D/+YdRdaVNMJETH0HFeu Y4j/vswB0m6zWWfFKTgbgYbfDluhj/P6i0SktAl+EJfl7n7WhwhVFdNoZicEPJm7V4Fd7J P8gCE04aj8bzPvqmkM6q+hfGIfoyusYepfXSX/v9fyLXGXJjE1gYao6IuAOG/kSU8aPDPQ cB8W9Ce8J3zOXJOfibaWkOXIGQ9pH5GlKjGQN8tkzPBXf38jJUJq+RtaPksi7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dqfbq5CqXzc1W for ; Mon, 12 Jan 2026 17:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36ae9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 17:33:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: 6741fb1bd4f4 - stable/14 - loader.efi: only use firmware provided Blt on GOP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6741fb1bd4f473f3bc46e46841d2e53a9629907c Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 17:33:11 +0000 Message-Id: <69653057.36ae9.2334c772@gitrepo.freebsd.org> The branch stable/14 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=6741fb1bd4f473f3bc46e46841d2e53a9629907c commit 6741fb1bd4f473f3bc46e46841d2e53a9629907c Author: Ahmad Khalifa AuthorDate: 2026-01-04 13:15:37 +0000 Commit: Ahmad Khalifa CommitDate: 2026-01-12 17:26:33 +0000 loader.efi: only use firmware provided Blt on GOP gfx_state.tg_private points to a EFI_GRAPHICS_OUTPUT_PROTOCOL only when using GOP. The firmware provided Blt functions on UGA platforms have been observed to not work on old MacBooks, and are likley hit or miss anyways as UGA has been deprecated since 2006. Reviewed by: tsoome PR: 291935 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54432 (cherry picked from commit 9595055ae7494997bb07b4aaed544f88ac4c5e7f) --- stand/common/gfx_fb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 9942c629d124..67f757983cd3 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -83,6 +83,7 @@ */ #include +#include #include #include #include @@ -783,7 +784,7 @@ gfxfb_blt(void *BltBuffer, GFXFB_BLT_OPERATION BltOperation, int rv; #if defined(EFI) EFI_STATUS status; - EFI_GRAPHICS_OUTPUT *gop = gfx_state.tg_private; + EFI_GRAPHICS_OUTPUT *gop; EFI_TPL tpl; /* @@ -793,7 +794,9 @@ gfxfb_blt(void *BltBuffer, GFXFB_BLT_OPERATION BltOperation, * done as they are provided by protocols that disappear when exit * boot services. */ - if (gop != NULL && boot_services_active) { + if (gfx_state.tg_fb_type == FB_GOP && boot_services_active) { + assert(gfx_state.tg_private != NULL); + gop = gfx_state.tg_private; tpl = BS->RaiseTPL(TPL_NOTIFY); switch (BltOperation) { case GfxFbBltVideoFill: