From nobody Sun Jan 4 13:21:02 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 4dkdNZ75Xmz6N1rN for ; Sun, 04 Jan 2026 13:21:02 +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 4dkdNZ55cSz3Kcf for ; Sun, 04 Jan 2026 13:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532862; 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=lzdiFuTQNdoePsgsjYpduBi8TS5V3BE/UGSJMUM4FsY=; b=YF4MLzDvD9koQZFkycLTB62rBCnLIhlYVijWu7GnuXiO7vSkmzO/c88S5/1dBZGq5azFhs GzjQuBM7aUhpmV/WX6W72sRvSrX7YfNtw+WPvUeTBiuCrqETnbmH+g6TsJbfx5Fk1KjqtW 5TBb97dfF1yHVCeLzu5AkCranL8D2jtjq3yLDwRvQUEXh2ZfyQtmhkz7B1LP9ZA2WPImfZ SstuCGRUrmBbidXpXuY0fx8NigNozOSr56cvGEUMj2AFoepQ4dEDZt8DfhexpWbZ442RM2 dQnZnI3emcmJyldcsMBLxFzAQphArr/+C0Wv95Mqkieog8dWbLpuV9g4e7wY0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532862; 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=lzdiFuTQNdoePsgsjYpduBi8TS5V3BE/UGSJMUM4FsY=; b=WkcX/o8GC3d7wFsDbSykTxiJ6Wn3YZZCdTv6d3pmuxJGjBW4BsHW+spk4vphb8XrQLsWN4 CV5uZJsekh+1qQ7SmMHUEpxnF7VIJOuY6wFja3TVxgnlW4wc+gtWcA84IAGl4uRwKPCxtU +P1TeKAbt3+KuZ9pGi8WT5+8OgOeLBDn2/44AZiKUXMGgycBNu1P0e8U6eK7utBkixnu4I Y6Cv8V3zTA6zwqikL1VT9z38OsKTyOkCTSL/TxWyWoTuWMZ5RBM6V5AmwNsFCz76YaWdqd s+sBD0vIMhOAU3tSXtHg5mABKB1hNf3nSq5LeEUFWOXOO4eHLeD1AYZDBDO9rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767532862; a=rsa-sha256; cv=none; b=dhpt2wwol+ZI7FOw6tbhDolJVFrYsgNX7u8Yb5r+tVpPsoSuG2gooyS2pouwYf/B88uQMY C6XhCw7x/LQ76Cn1CY1/cz7XUCNGf/rHc+uEmZnxyVTpJk8LwUoS8M+agYnSUksoF//vn7 bQXIwyzZSQHHLKhJyIrRRjrYEHfROFW2dQUQoqmk+JX5YCQZzPSO5hwW2JTld1bkwF2ytW OBK1JHub3zZMW8T3V0KjEWvKUHgCLhQB3QiTmgtqyZgrMDpqdqSUVzncsd3/tgumIdGI4+ NHoc1MnDZwtS5OmLdD4MmWNyQkWG5hg4F4aBntTrkbhTg0KPVRi399D/La0aRw== 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 4dkdNZ4ZkmzcFq for ; Sun, 04 Jan 2026 13:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:21:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 9595055ae749 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9595055ae7494997bb07b4aaed544f88ac4c5e7f Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:21:02 +0000 Message-Id: <695a693e.3a4b0.7bba4b46@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=9595055ae7494997bb07b4aaed544f88ac4c5e7f commit 9595055ae7494997bb07b4aaed544f88ac4c5e7f Author: Ahmad Khalifa AuthorDate: 2026-01-04 13:15:37 +0000 Commit: Ahmad Khalifa CommitDate: 2026-01-04 13:15:37 +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 --- 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 eb41c51c50b6..d99d9b7a868f 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_PROTOCOL *gop = gfx_state.tg_private; + EFI_GRAPHICS_OUTPUT_PROTOCOL *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: