From nobody Thu Dec 23 04:02:17 2021 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 318A318FE56B; Thu, 23 Dec 2021 04:02:18 +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 4JKGjj4ycrz4bbL; Thu, 23 Dec 2021 04:02:17 +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 8A7A51A7F; Thu, 23 Dec 2021 04:02:17 +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 1BN42HEN037717; Thu, 23 Dec 2021 04:02:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BN42HD3037703; Thu, 23 Dec 2021 04:02:17 GMT (envelope-from git) Date: Thu, 23 Dec 2021 04:02:17 GMT Message-Id: <202112230402.1BN42HD3037703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 76cbf7864063 - stable/13 - loader.efi: Do not use as frame buffer BLT-only GOPs. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 76cbf786406311b7d89db0b725f9cd0c890e54e4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640232137; 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=IGqUhnaCbG+z9hFuiaeAvBDXpgHIQ8/pKNFYycuod6I=; b=rsBxhbuAV9YkSogg6/WSmPxNXXCJoI+NCAlE+4Lbra78QxvVPUO/aNHRm+GU7txP3ecbgu 80IWojR+Q2NXn2V9JBdovVXhC1JYgqqwuZjsc1ZSG8dWyG8SD56E4Aq96wjTDSbUYN8ZTH IUM8O8wIuNDHkaFl8RGWJ9KU1SuUHhGMmcY/tMkoBzqEUIukM1akdSUBl6yeOBLv0828Ys FG/IVVd1rVs5EWypQxVNZZmiwVCpSoN/vQuMMMjGBSwwjXX0sIEDtZyBqySjwb5xUEXDqw Gv925MshW0oUZJAHUM9BcBWKB0GiXdzmKVZ8Kl0coSHdI3b76Lz7FSLBKyGjpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640232137; a=rsa-sha256; cv=none; b=fONGMOSuz591EuOMKQHPXPfKZt9BZj9SY5lPsyBTgNgx0TAdNSbugMSHt7Rc7rqmBi5iAV wh9Q6irxAOmMQGyVwgdaj5wm6XdRmujVIarkEaXlSakQIGz21JigWMwZ+4Gl6181qwmOem GDKf3sZ6X0il1qAudGAg2gnreCx5ppB6LZkCMVU9cgUm76IwGu5DaGH4lCid/LGHK+PT4a Pj3Q2B1+y9kT3t6a/HKrMnmhvWCkQ9lxvjXtI4PDgRC5sZLDECnHU4dXy9DQGGz49YvgBA krfP+TWsTD2lNUTg+8KKvTyoPeKgZA/nZ1e0amJWPhjlnHNNhiOTqLYQyHC4gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=76cbf786406311b7d89db0b725f9cd0c890e54e4 commit 76cbf786406311b7d89db0b725f9cd0c890e54e4 Author: Alexander Motin AuthorDate: 2021-12-16 16:44:34 +0000 Commit: Alexander Motin CommitDate: 2021-12-23 04:02:11 +0000 loader.efi: Do not use as frame buffer BLT-only GOPs. Kernel needs physical frame buffer address and size, which Block Transfer-only Graphics Output Protocol instances do not have. Some recent ASUS boards like PRIME Z690M-PLUS D4 and PRIME H570-Plus report two GOPs, out of which the second one support ConOut protocol, that made it preferable, but is BLT-only, that made console unusable. Discussed with: tsoome (previous version) MFC after: 1 week (cherry picked from commit 02732f945ed2ec2b4fd03421923720608b28a615) --- stand/efi/loader/framebuffer.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c index adb9dfb62cee..b62ed17d3d29 100644 --- a/stand/efi/loader/framebuffer.c +++ b/stand/efi/loader/framebuffer.c @@ -567,21 +567,33 @@ efi_find_framebuffer(teken_gfx_t *gfx_state) /* * Search for ConOut protocol, if not found, use first handle. */ - gop_handle = *hlist; + gop_handle = NULL; for (i = 0; i < nhandles; i++) { - void *dummy = NULL; + EFI_GRAPHICS_OUTPUT *tgop; + void *dummy; + + status = OpenProtocolByHandle(hlist[i], &gop_guid, (void **)&tgop); + if (status != EFI_SUCCESS) + continue; + + if (tgop->Mode->Info->PixelFormat == PixelBltOnly || + tgop->Mode->Info->PixelFormat >= PixelFormatMax) + continue; status = OpenProtocolByHandle(hlist[i], &conout_guid, &dummy); if (status == EFI_SUCCESS) { gop_handle = hlist[i]; + gop = tgop; break; + } else if (gop_handle == NULL) { + gop_handle = hlist[i]; + gop = tgop; } } - status = OpenProtocolByHandle(gop_handle, &gop_guid, (void **)&gop); free(hlist); - if (status == EFI_SUCCESS) { + if (gop_handle != NULL) { gfx_state->tg_fb_type = FB_GOP; gfx_state->tg_private = gop; if (edid_info == NULL)