From owner-dev-commits-src-main@freebsd.org Wed Jan 13 17:08:27 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 6E8434E29B5; Wed, 13 Jan 2021 17:08:27 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DGDRb2lDVz3D0t; Wed, 13 Jan 2021 17:08:27 +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 511381AF4C; Wed, 13 Jan 2021 17:08:27 +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 10DH8Rn2082391; Wed, 13 Jan 2021 17:08:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10DH8RZB082390; Wed, 13 Jan 2021 17:08:27 GMT (envelope-from git) Date: Wed, 13 Jan 2021 17:08:27 GMT Message-Id: <202101131708.10DH8RZB082390@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: 98c15d4dc284 - main - loader.efi: initial terminal size should base on UEFI terminal size 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: 98c15d4dc28450688dcee6c6082d3a4d417b5d5d 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: Wed, 13 Jan 2021 17:08:27 -0000 The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=98c15d4dc28450688dcee6c6082d3a4d417b5d5d commit 98c15d4dc28450688dcee6c6082d3a4d417b5d5d Author: Toomas Soome AuthorDate: 2021-01-13 17:05:51 +0000 Commit: Toomas Soome CommitDate: 2021-01-13 17:05:51 +0000 loader.efi: initial terminal size should base on UEFI terminal size We do select font based on desired terminal size, we do query UEFI terminal size with conout->QueryMode(), but by mistake, the fallback values are used. --- stand/efi/libefi/efi_console.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stand/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c index 1ed2be15d3d6..4c04461a5f92 100644 --- a/stand/efi/libefi/efi_console.c +++ b/stand/efi/libefi/efi_console.c @@ -953,13 +953,13 @@ cons_update_mode(bool use_gfx_mode) /* * setup_font() can adjust terminal size. - * Note, we assume 80x24 terminal first, this is - * because the font selection will attempt to achieve - * at least this terminal dimension and we do not - * end up with too small font. + * Note, we do use UEFI terminal dimensions first, + * this is because the font selection will attempt + * to achieve at least this terminal dimension and + * we do not end up with too small font. */ - gfx_state.tg_tp.tp_row = TEXT_ROWS; - gfx_state.tg_tp.tp_col = TEXT_COLS; + gfx_state.tg_tp.tp_row = rows; + gfx_state.tg_tp.tp_col = cols; setup_font(&gfx_state, fb_height, fb_width); rows = gfx_state.tg_tp.tp_row; cols = gfx_state.tg_tp.tp_col;