From nobody Mon Jan 12 17:33:07 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 4dqfbl5K9tz6NsNT for ; Mon, 12 Jan 2026 17:33:07 +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 4dqfbl2vrtz47DY for ; Mon, 12 Jan 2026 17:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768239187; 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=olTI3NZPARAvarGn1bESFOziuWtSdrx9tpbJg76UcRc=; b=yo0kP61riyYiDtBM6dYJF4gKrBencPBimooze7DFHQEuEiFfSN/s61B/oL0hllPEAvGDYF raqQfilUDYdcC5viPQ3dcurcwL6D1G1I8Nwt/ju/Yec1KAH25+FsvNaLKRTU19+eRRXU29 nRQ1JTIb9UF0Nr+3DZKxQOBDMSfinaZr7Yx3g3D693QviIs6cRq9CzM3hnrUzZSVNT6APg yHCMrfUbB8yU7PP7aTxJDmfUgcaWe8mz0TCgV/m7joDrMW/cB62OyszFCjIwDl2BPfBAXP vbQXdSrz1iCwRIMj9I13Ln8NSzOsa9tPzdznXaKJUbNnyAlqv8wuZpV9T2YX0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768239187; 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=olTI3NZPARAvarGn1bESFOziuWtSdrx9tpbJg76UcRc=; b=EbfipAhaJh7csBH3Bs1Os4/bAk4qzxov+fGFrccb2O34JTa3tK4+oMy/nWkU1KYhVRtfli Y0+wtQBzPo2QCZJlCxc/9U90VIEpOCYgd1TP4NLe1iixNIbp1gEztwfK9AosHQ86P7/PY9 P/29WZAS3PUdX3m36ppFsbvrUrx8FmtKnRBj/8/C9cZdS2SfEnAE67XtKBRRzO65fyvhA0 S1CDNdf5XEMnYWvSEkhLz9Dmn5Xi1aqthcnOm7rY+2L9mj45n4ZGPkaiXKKrHxUeV/POhd weDhVvMjtxPafvWkhNXKZpy9n10GNoOnjtDnjp3b0n3x1M59/0v3OAkbGzx8KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768239187; a=rsa-sha256; cv=none; b=E34/3GCRvL4itt11lwXEd2QBItatkltID3qzpiX1pzkEuFfIjgSEG29jDxiotJOgFKrdja CiscCCLTXnohoMlbt1hxUzkg6SC8d+b0PJrx+HnCenmSx4X3qT7b7TZuoRIw49LbFJHfko lA1FJJ5AgN0YbvsVuqRGcQOEz+TvIWMJArDg9DJwqRFhXqYy+5R2JSQmIROkGAlak6tcBL QEPxhM345M1MzraedUr5REbp6pcmVDILOpiXAQ2tueN0B50XNApzONXuk290IDQ3LAFKLh QJbU2oO0WhbvpX9bmZ84HhgM7QM5as9gbtaGjH7XK6UrFWfmsmt+RZ4DxJd6ZA== 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 4dqfbl2HMhzcv5 for ; Mon, 12 Jan 2026 17:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39612 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 17:33:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: 8591ee986b22 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 8591ee986b22007a98ded2f3dc86e8065f14b213 Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 17:33:07 +0000 Message-Id: <69653053.39612.14942e12@gitrepo.freebsd.org> The branch stable/13 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=8591ee986b22007a98ded2f3dc86e8065f14b213 commit 8591ee986b22007a98ded2f3dc86e8065f14b213 Author: Ahmad Khalifa AuthorDate: 2026-01-04 13:15:37 +0000 Commit: Ahmad Khalifa CommitDate: 2026-01-12 17:28:03 +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 27ac66f259b1..8482390ab0ea 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -84,6 +84,7 @@ #include #include +#include #include #include #include @@ -780,7 +781,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; /* @@ -790,7 +791,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: