From: Rob Clark <robdclark@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 20/21] efi_loader: Correctly figure out size for vidconsole
Date: Wed, 13 Sep 2017 18:05:43 -0400 [thread overview]
Message-ID: <20170913220546.19560-21-robdclark@gmail.com> (raw)
In-Reply-To: <20170913220546.19560-1-robdclark@gmail.com>
If stdout is vidconsole, we cannot rely on ANSI escape sequences to
query the size, as vidconsole cannot reply on stdin. Instead special-
case this if stdout is vidconsole.
Signed-off-by: Rob Clark <robdclark@gmail.com>
---
lib/efi_loader/efi_console.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index e8c02870eb..9048a8d32c 100644
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -8,7 +8,10 @@
#include <common.h>
#include <charset.h>
+#include <dm/device.h>
#include <efi_loader.h>
+#include <stdio_dev.h>
+#include <video_console.h>
static bool console_size_queried;
@@ -222,12 +225,23 @@ static efi_status_t EFIAPI efi_cout_query_mode(
EFI_ENTRY("%p, %ld, %p, %p", this, mode_number, columns, rows);
if (!console_size_queried) {
+ const char *stdout_name = env_get("stdout");
int rows, cols;
console_size_queried = true;
- if (query_console_serial(&rows, &cols))
+ if (stdout_name && !strcmp(stdout_name, "vidconsole") &&
+ IS_ENABLED(CONFIG_DM_VIDEO)) {
+ struct stdio_dev *stdout_dev =
+ stdio_get_by_name("vidconsole");
+ struct udevice *dev = stdout_dev->priv;
+ struct vidconsole_priv *priv =
+ dev_get_uclass_priv(dev);
+ rows = priv->rows;
+ cols = priv->cols;
+ } else if (query_console_serial(&rows, &cols)) {
goto out;
+ }
/* Test if we can have Mode 1 */
if (cols >= 80 && rows >= 50) {
--
2.13.5
next prev parent reply other threads:[~2017-09-13 22:05 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-13 22:05 [U-Boot] [PATCH v3 00/21] efi_loader: enough UEFI for standard distro boot Rob Clark
2017-09-13 22:05 ` [U-Boot] [PATCH v3 01/21] part: move efi_guid_t Rob Clark
2017-09-15 18:19 ` [U-Boot] [U-Boot,v3,01/21] " Heinrich Schuchardt
2017-09-15 18:34 ` Heinrich Schuchardt
2017-09-21 7:04 ` Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 02/21] part: extract MBR signature from partitions Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-10-02 18:17 ` [U-Boot] [PATCH v3 " Fabio Estevam
2017-10-02 18:49 ` Peter Robinson
2017-10-02 19:02 ` Fabio Estevam
2017-10-02 19:32 ` Tom Rini
2017-10-03 0:30 ` Fabio Estevam
2017-10-02 19:35 ` Rob Clark
2017-10-03 1:52 ` Fabio Estevam
2017-09-13 22:05 ` [U-Boot] [PATCH v3 03/21] efi: add some missing __packed Rob Clark
2017-09-15 18:53 ` [U-Boot] [U-Boot,v3,03/21] " Heinrich Schuchardt
2017-09-15 18:58 ` Rob Clark
2017-10-03 14:34 ` Peter Jones
2017-09-21 7:04 ` Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 04/21] efi: add some more device path structures Rob Clark
2017-09-21 7:04 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 05/21] efi_loader: add device-path utils Rob Clark
2017-09-20 8:31 ` Alexander Graf
2017-09-20 14:15 ` Rob Clark
2017-09-21 7:04 ` [U-Boot] [U-Boot,v3,05/21] " Alexander Graf
2017-10-28 15:53 ` [U-Boot] [PATCH v3 05/21] " Heinrich Schuchardt
2017-09-13 22:05 ` [U-Boot] [PATCH v3 06/21] efi_loader: drop redundant efi_device_path_protocol Rob Clark
2017-09-21 7:04 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 07/21] efi_loader: flesh out device-path to text Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 08/21] efi_loader: use proper device-paths for partitions Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 09/21] efi_loader: use proper device-paths for net Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 10/21] efi_loader: refactor boot device and loaded_image handling Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 11/21] efi_loader: add file/filesys support Rob Clark
2017-09-21 7:04 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 12/21] efi_loader: support load_image() from a file-path Rob Clark
2017-09-21 7:04 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 13/21] efi_loader: make pool allocations cacheline aligned Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 14/21] efi_loader: efi variable support Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot,v3,14/21] " Alexander Graf
2017-10-19 20:40 ` [U-Boot] Unexpected saving of all environment variables during EFI boot Heinrich Schuchardt
2017-10-19 21:05 ` Alexander Graf
2017-10-19 21:15 ` Rob Clark
2017-10-19 21:28 ` Alexander Graf
2017-10-19 22:25 ` Heinrich Schuchardt
2017-10-19 22:15 ` [U-Boot] [PATCH 1/1] efi_loader: disable saving of EFI variables Heinrich Schuchardt
2017-10-22 14:37 ` Simon Glass
2017-09-13 22:05 ` [U-Boot] [PATCH v3 15/21] efi_loader: add bootmgr Rob Clark
2017-09-20 9:08 ` Alexander Graf
2017-09-20 14:09 ` Rob Clark
2017-09-21 4:58 ` Simon Glass
2017-09-21 5:07 ` Alexander Graf
2017-09-21 14:22 ` Rob Clark
2017-09-25 2:14 ` Simon Glass
2017-09-21 7:05 ` [U-Boot] [U-Boot,v3,15/21] " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 16/21] efi_loader: file_path should be variable length Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 17/21] efi_loader: set loaded image code/data type properly Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 18/21] efi_loader: print GUIDs Rob Clark
2017-09-21 7:04 ` [U-Boot] [U-Boot,v3,18/21] " Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 19/21] efi_loader: split out escape sequence based size query Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-13 22:05 ` Rob Clark [this message]
2017-09-21 7:04 ` [U-Boot] [U-Boot, v3, 20/21] efi_loader: Correctly figure out size for vidconsole Alexander Graf
2017-09-13 22:05 ` [U-Boot] [PATCH v3 21/21] efi_loader: Some console improvements " Rob Clark
2017-09-21 7:05 ` [U-Boot] [U-Boot, v3, " Alexander Graf
2017-09-20 9:32 ` [U-Boot] [PATCH v3 00/21] efi_loader: enough UEFI for standard distro boot Alexander Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170913220546.19560-21-robdclark@gmail.com \
--to=robdclark@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox