From owner-dev-commits-src-main@freebsd.org Sat Jan 16 19:14:47 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 521804E83EE; Sat, 16 Jan 2021 19:14:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DJ75z1sGsz4hFZ; Sat, 16 Jan 2021 19:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 32B47143A8; Sat, 16 Jan 2021 19:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10GJElOR066798; Sat, 16 Jan 2021 19:14:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10GJEl9n066797; Sat, 16 Jan 2021 19:14:47 GMT (envelope-from git) Date: Sat, 16 Jan 2021 19:14:47 GMT Message-Id: <202101161914.10GJEl9n066797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: 3ddf7eade0e9 - main - loader.efi: Use Blt with gop as default MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ddf7eade0e9e770a78f190bee00c2a7ba256ef5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2021 19:14:47 -0000 The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=3ddf7eade0e9e770a78f190bee00c2a7ba256ef5 commit 3ddf7eade0e9e770a78f190bee00c2a7ba256ef5 Author: Toomas Soome AuthorDate: 2021-01-16 15:35:51 +0000 Commit: Toomas Soome CommitDate: 2021-01-16 15:39:40 +0000 loader.efi: Use Blt with gop as default System with FB address 0x4000000000 does not draw, Blt() is doing fine. I think, we can assume the Blt will usually work. --- 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 76fd8855a5be..9342521fd0cf 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -710,8 +710,11 @@ gfxfb_blt(void *BltBuffer, GFXFB_BLT_OPERATION BltOperation, EFI_STATUS status; EFI_GRAPHICS_OUTPUT *gop = gfx_state.tg_private; - if (gop != NULL && (gop->Mode->Info->PixelFormat == PixelBltOnly || - gfx_state.tg_fb.fb_addr == 0)) { + /* + * We assume Blt() does work, if not, we will need to build + * exception list case by case. + */ + if (gop != NULL) { switch (BltOperation) { case GfxFbBltVideoFill: status = gop->Blt(gop, BltBuffer, EfiBltVideoFill,