git: 98c15d4dc284 - main - loader.efi: initial terminal size should base on UEFI terminal size

[Toomas Soome]

The branch main has been updated by tsoome:

URL: https://cgit.FreeBSD.org/src/commit/?id=98c15d4dc28450688dcee6c6082d3a4d417b5d5d

commit 98c15d4dc28450688dcee6c6082d3a4d417b5d5d
Author:     Toomas Soome <tsoome at FreeBSD.org>
AuthorDate: 2021-01-13 17:05:51 +0000
Commit:     Toomas Soome <tsoome at FreeBSD.org>
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;