From nobody Mon Jan 12 17:33:16 2026 X-Original-To: dev-commits-src-branches@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 4dqfbw6RvNz6Ns54 for ; Mon, 12 Jan 2026 17:33:16 +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 4dqfbw2Dm0z470g for ; Mon, 12 Jan 2026 17:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768239196; 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=Jky4WvSzsl03hNOY+BnzpPJ73gs9G7vkGNbcUglR5M4=; b=gz9Xp5yjmC2CcdvaC+8tjdN1oaMRRoVMjrmARAwLR3ng+u3/wcbPqVa4//LWoBswahJdye AkIAc0AawXrvFIJmfB6P8nhyJlq6geN+GxVITqyatuguB9YwTXaeR4WYrRoo7nbPpkX3aU gOxwQJ7MjtWG0bPO+UcovGN/FB/l2n2K/aD6TiuNMSn+zF0t8CT65AeigvNfyAZ8tEAOKF F8akoOVaiBhGLPMTyt2COpCW0phR4jl+d6ltI0AQT/MZmoHCoX4iRxirD34at0JT5THrfz xPPYeWgbmqIDv6eWMjz6LaK8iGhmz8fyGVBGTOzq+0WEOg9KZfDGVTx3BawFcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768239196; 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=Jky4WvSzsl03hNOY+BnzpPJ73gs9G7vkGNbcUglR5M4=; b=pcdG0PO8xPHWDAsf1YLCk/oFDg7tLb6ptj9B8XJTLm0nVsj3GOgIvOYaNy9H7eM2PFOt98 IA3rnClav9YjM5aKwqhCEju79WoOrcuUjdIasrBv4C8Zs11uvV1Zezuzs8/0O6qpr5/j9E wnxUbbQoN1XhJq9dil8M1P/bKoNUFV65gb3EJZEugxRnoVynIPTtGFTAEPT7gXSdCsrJYG moVe4OkiB2sbp9c3YAs6sE0gc7i50s+U0R4ank56jS7/wc+1Ydr6XTvixr46REdL7SyVmv MXzJm+nXR2aae0kvzMB/BD+Bqb8/TJAPG1ByuCqh+HcNwiQIKN3dtyq9osDsVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768239196; a=rsa-sha256; cv=none; b=SHL66NUqUnni4ibBSdoRsaSVq28WjDg+EpgRKGNHLgs2QNllghpI4xXoPoU0eeTpIEI0RQ rTV++4XE+rhjDibuF7eI1arl/QpNL8J/uJI9KCrdkjEXKzjkgzgQBR8Y4+j4OYoI/7HdyN iTMk0mt9d9fs+c/McHlWCE/+/FhxwHo6b+5vSiR2WhCQmyVS4E8G2O2q7a/qVSpP6dSz+u d2P3kYgwEgBsU3px7Z6auZaJkhTfp3adISLAsGIKV0/vKFROQsknLYHHqXk35KUs/mT/5j Mj76gXoAFpwA++3Vc1rZtYGu6d/65X98EWmRYbhKU6ncHuZJVvMyPn1HzWmj9g== 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 4dqfbw1VtVzcrk for ; Mon, 12 Jan 2026 17:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38acd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 17:33:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: d3902baca506 - stable/15 - loader.efi: only use firmware provided Blt on GOP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: d3902baca506ec48e2f8b1121c7744766a175516 Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 17:33:16 +0000 Message-Id: <6965305c.38acd.4a14367c@gitrepo.freebsd.org> The branch stable/15 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=d3902baca506ec48e2f8b1121c7744766a175516 commit d3902baca506ec48e2f8b1121c7744766a175516 Author: Ahmad Khalifa AuthorDate: 2026-01-04 13:15:37 +0000 Commit: Ahmad Khalifa CommitDate: 2026-01-12 17:24:55 +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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 659bf8540422..3ac3694ce5fe 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -83,6 +83,7 @@ */ #include +#include #include #include #include @@ -856,7 +857,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; /* @@ -866,7 +867,10 @@ gfxfb_blt(void *BltBuffer, GFXFB_BLT_OPERATION BltOperation, * done as they are provided by protocols that disappear when exit * boot services. */ - if (!ignore_gop_blt && gop != NULL && boot_services_active) { + if (gfx_state.tg_fb_type == FB_GOP && !ignore_gop_blt && + boot_services_active) { + assert(gfx_state.tg_private != NULL); + gop = gfx_state.tg_private; tpl = BS->RaiseTPL(TPL_NOTIFY); switch (BltOperation) { case GfxFbBltVideoFill: