From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>,
Nikhil M Jain <n-jain1@ti.com>, Bin Meng <bmeng.cn@gmail.com>,
Simon Glass <sjg@chromium.org>
Subject: [PATCH v3 25/43] x86: Pass video settings from SPL to U-Boot proper
Date: Thu, 4 May 2023 16:58:11 -0600 [thread overview]
Message-ID: <20230504165823.v3.25.Ieb0824a81d8ad4109fa501c9497b01b8749f913a@changeid> (raw)
In-Reply-To: <20230504225829.2537050-1-sjg@chromium.org>
When video is set up in SPL, U-Boot proper needs to use the correct
parameters so it can write to the display.
Put these in a bloblist so they are available to U-Boot proper.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v3:
- Add a tag name for the blob
common/bloblist.c | 1 +
drivers/pci/pci_rom.c | 78 +++++++++++++++++++++++++++++++------------
include/bloblist.h | 1 +
include/video.h | 24 +++++++++++++
4 files changed, 83 insertions(+), 21 deletions(-)
diff --git a/common/bloblist.c b/common/bloblist.c
index 0d63b6e8817..2144b10e1d0 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -51,6 +51,7 @@ static struct tag_name {
/* BLOBLISTT_PROJECT_AREA */
{ BLOBLISTT_U_BOOT_SPL_HANDOFF, "SPL hand-off" },
+ { BLOBLISTT_U_BOOT_VIDEO, "SPL video handoff" },
/* BLOBLISTT_VENDOR_AREA */
};
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 2d9a2a899ef..ecb6da64c5c 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -26,6 +26,7 @@
#include <common.h>
#include <bios_emul.h>
+#include <bloblist.h>
#include <bootstage.h>
#include <dm.h>
#include <errno.h>
@@ -34,6 +35,7 @@
#include <malloc.h>
#include <pci.h>
#include <pci_rom.h>
+#include <spl.h>
#include <vesa.h>
#include <video.h>
#include <acpi/acpi_s3.h>
@@ -420,34 +422,68 @@ int vesa_setup_video(struct udevice *dev, int (*int15_handler)(void))
printf("Not available (previous bootloader prevents it)\n");
return -EPERM;
}
- bootstage_start(BOOTSTAGE_ID_ACCUM_LCD, "vesa display");
- ret = dm_pci_run_vga_bios(dev, int15_handler, PCI_ROM_USE_NATIVE |
- PCI_ROM_ALLOW_FALLBACK);
- bootstage_accum(BOOTSTAGE_ID_ACCUM_LCD);
- if (ret) {
- debug("failed to run video BIOS: %d\n", ret);
- return ret;
- }
- ret = vesa_setup_video_priv(&mode_info.vesa,
- mode_info.vesa.phys_base_ptr, uc_priv,
- plat);
- if (ret) {
- if (ret == -ENFILE) {
- /*
- * See video-uclass.c for how to set up reserved memory
- * in your video driver
- */
- log_err("CONFIG_VIDEO_COPY enabled but driver '%s' set up no reserved memory\n",
- dev->driver->name);
+ /* In U-Boot proper, collect the information added by SPL (see below) */
+ if (IS_ENABLED(CONFIG_SPL_VIDEO) && spl_phase() > PHASE_SPL &&
+ CONFIG_IS_ENABLED(BLOBLIST)) {
+ struct video_handoff *ho;
+
+ ho = bloblist_find(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho));
+ if (!ho)
+ return log_msg_ret("blf", -ENOENT);
+ plat->base = ho->fb;
+ plat->size = ho->size;
+ uc_priv->xsize = ho->xsize;
+ uc_priv->ysize = ho->ysize;
+ uc_priv->line_length = ho->line_length;
+ uc_priv->bpix = ho->bpix;
+ } else {
+ bootstage_start(BOOTSTAGE_ID_ACCUM_LCD, "vesa display");
+ ret = dm_pci_run_vga_bios(dev, int15_handler,
+ PCI_ROM_USE_NATIVE |
+ PCI_ROM_ALLOW_FALLBACK);
+ bootstage_accum(BOOTSTAGE_ID_ACCUM_LCD);
+ if (ret) {
+ debug("failed to run video BIOS: %d\n", ret);
+ return ret;
}
- debug("No video mode configured\n");
- return ret;
+ ret = vesa_setup_video_priv(&mode_info.vesa,
+ mode_info.vesa.phys_base_ptr,
+ uc_priv, plat);
+ if (ret) {
+ if (ret == -ENFILE) {
+ /*
+ * See video-uclass.c for how to set up reserved
+ * memory in your video driver
+ */
+ log_err("CONFIG_VIDEO_COPY enabled but driver '%s' set up no reserved memory\n",
+ dev->driver->name);
+ }
+
+ debug("No video mode configured\n");
+ return ret;
+ }
}
printf("Video: %dx%dx%d\n", uc_priv->xsize, uc_priv->ysize,
mode_info.vesa.bits_per_pixel);
+ /* In SPL, store the information for use by U-Boot proper */
+ if (spl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(BLOBLIST)) {
+ struct video_handoff *ho;
+
+ ho = bloblist_add(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho), 0);
+ if (!ho)
+ return log_msg_ret("blc", -ENOMEM);
+
+ ho->fb = plat->base;
+ ho->size = plat->size;
+ ho->xsize = uc_priv->xsize;
+ ho->ysize = uc_priv->ysize;
+ ho->line_length = uc_priv->line_length;
+ ho->bpix = uc_priv->bpix;
+ }
+
return 0;
}
diff --git a/include/bloblist.h b/include/bloblist.h
index 2a2f1700eb0..7ea72c6bd46 100644
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -113,6 +113,7 @@ enum bloblist_tag_t {
BLOBLISTT_PROJECT_AREA = 0x8000,
BLOBLISTT_U_BOOT_SPL_HANDOFF = 0x8000, /* Hand-off info from SPL */
BLOBLISTT_VBE = 0x8001, /* VBE per-phase state */
+ BLOBLISTT_U_BOOT_VIDEO = 0x8002, /* Video information from SPL */
/*
* Vendor-specific tags are permitted here. Projects can be open source
diff --git a/include/video.h b/include/video.h
index 29c4f51efb0..18ed159b8d8 100644
--- a/include/video.h
+++ b/include/video.h
@@ -133,6 +133,30 @@ struct video_ops {
#define video_get_ops(dev) ((struct video_ops *)(dev)->driver->ops)
+/**
+ * struct video_handoff - video information passed from SPL
+ *
+ * This is used when video is set up by SPL, to provide the details to U-Boot
+ * proper.
+ *
+ * @fb: Base address of frame buffer, 0 if not yet known
+ * @size: Frame-buffer size, in bytes
+ * @xsize: Number of pixel columns (e.g. 1366)
+ * @ysize: Number of pixels rows (e.g.. 768)
+ * @line_length: Length of each frame buffer line, in bytes. This can be
+ * set by the driver, but if not, the uclass will set it after
+ * probing
+ * @bpix: Encoded bits per pixel (enum video_log2_bpp)
+ */
+struct video_handoff {
+ u64 fb;
+ u32 size;
+ ushort xsize;
+ ushort ysize;
+ u32 line_length;
+ u8 bpix;
+};
+
/** enum colour_idx - the 16 colors supported by consoles */
enum colour_idx {
VID_BLACK = 0,
--
2.40.1.521.gf1e218fcd8-goog
next prev parent reply other threads:[~2023-05-04 23:04 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 22:57 [PATCH v3 00/43] x86: Use qemu-x86_64 to boot EFI installers Simon Glass
2023-05-04 22:57 ` [PATCH v3 01/43] x86: Allow listing MTRRs in SPL Simon Glass
2023-05-04 22:57 ` [PATCH v3 02/43] x86: mtrr: Add documentation Simon Glass
2023-05-04 22:57 ` [PATCH v3 03/43] bios_emulator: Add Kconfig and adjust Makefile for SPL Simon Glass
2023-05-04 22:57 ` [PATCH v3 04/43] bios_emulator: Drop VIDEO_IO_OFFSET Simon Glass
2023-05-04 22:57 ` [PATCH v3 05/43] x86: Tidy up EFI code in interrupt_init() Simon Glass
2023-05-04 22:57 ` [PATCH v3 06/43] x86: Add a comment for board_init_f_r_trampoline() Simon Glass
2023-05-04 22:57 ` [PATCH v3 07/43] x86: Show the CPU physical address size with bdinfo Simon Glass
2023-05-04 22:57 ` [PATCH v3 08/43] x86: Correct get_sp() implementation for 64-bit Simon Glass
2023-05-04 22:57 ` [PATCH v3 09/43] x86: Show an error when a BIOS exception occurs Simon Glass
2023-05-04 22:57 ` [PATCH v3 10/43] acpi: Add a comment to set the acpi tables Simon Glass
2023-05-04 22:57 ` [PATCH v3 11/43] bdinfo: Show the RAM top and approximate stack pointer Simon Glass
2023-05-05 7:49 ` [EXTERNAL] " Nikhil M Jain
2023-05-04 22:57 ` [PATCH v3 12/43] part: Allow setting the partition-table type Simon Glass
2023-05-04 22:57 ` [PATCH v3 13/43] qfw: Show the file address if available Simon Glass
2023-05-04 22:58 ` [PATCH v3 14/43] log: Tidy up an ambiguous comment Simon Glass
2023-05-04 22:58 ` [PATCH v3 15/43] video: Allow building video drivers for SPL Simon Glass
2023-05-08 5:42 ` [EXTERNAL] " Nikhil M Jain
2023-05-04 22:58 ` [PATCH v3 16/43] qfw: Set the address of the ACPI tables Simon Glass
2023-05-04 22:58 ` [PATCH v3 17/43] efi: Show all known UUIDs with CONFIG_CMD_EFIDEBUG Simon Glass
2023-05-04 22:58 ` [PATCH v3 18/43] x86: Improve the trampoline in 64-bit mode Simon Glass
2023-05-04 22:58 ` [PATCH v3 19/43] Show the malloc base with the bdinfo command Simon Glass
2023-05-05 7:50 ` [EXTERNAL] " Nikhil M Jain
2023-05-04 22:58 ` [PATCH v3 20/43] nvme: Provide more useful debugging messages Simon Glass
2023-05-04 22:58 ` [PATCH v3 21/43] pci: Support autoconfig in SPL Simon Glass
2023-05-04 22:58 ` [PATCH v3 22/43] pci: Allow the video BIOS to work in SPL with QEMU Simon Glass
2023-05-04 22:58 ` [PATCH v3 23/43] pci: Tidy up logging and reporting for video BIOS Simon Glass
2023-05-04 22:58 ` [PATCH v3 24/43] x86: Allow video-BIOS code to be built for SPL Simon Glass
2023-05-04 22:58 ` Simon Glass [this message]
2023-05-05 4:27 ` [EXTERNAL] [PATCH v3 25/43] x86: Pass video settings from SPL to U-Boot proper Nikhil M Jain
2023-05-04 22:58 ` [PATCH v3 26/43] x86: Init video in SPL if enabled Simon Glass
2023-05-04 22:58 ` [PATCH v3 27/43] pci: Adjust video BIOS debugging to be SPL-friendly Simon Glass
2023-05-04 22:58 ` [PATCH v3 28/43] pci: Mask the ROM address in case it is already enabled Simon Glass
2023-05-04 22:58 ` [PATCH v3 29/43] x86: Enable display for QEMU 64-bit Simon Glass
2023-05-04 22:58 ` [PATCH v3 30/43] x86: Allow logging to be used in SPL reliably Simon Glass
2023-05-04 22:58 ` [PATCH v3 31/43] fs: fat: Shrink the size of a few strings Simon Glass
2023-05-04 22:58 ` [PATCH v3 32/43] fs: fat: Support reading from a larger block size Simon Glass
2023-05-04 22:58 ` [PATCH v3 33/43] x86: Enable useful options for qemu-86_64 Simon Glass
2023-05-04 22:58 ` [PATCH v3 34/43] x86: Refactor table-writing code a litlle Simon Glass
2023-05-04 22:58 ` [PATCH v3 35/43] x86: Record the start and end of the tables Simon Glass
2023-05-04 22:58 ` [PATCH v3 36/43] x86: Show the number of physical address bits Simon Glass
2023-05-04 22:58 ` [PATCH v3 37/43] x86: Convert some debug statements to use logging Simon Glass
2023-05-04 22:58 ` [PATCH v3 38/43] x86: link: Support Micron memory Simon Glass
2023-05-04 22:58 ` [PATCH v3 39/43] x86: Make sure that the LPC is active before SDRAM init Simon Glass
2023-05-04 22:58 ` [PATCH v3 40/43] log: Support outputing function names in SPL Simon Glass
2023-05-04 22:58 ` [PATCH v3 41/43] sandbox: Correct header order in board file Simon Glass
2023-05-04 22:58 ` [PATCH v3 42/43] sandbox: Install ACPI tables on startup Simon Glass
2023-05-04 22:58 ` [PATCH v3 43/43] efi: Use the installed ACPI tables Simon Glass
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=20230504165823.v3.25.Ieb0824a81d8ad4109fa501c9497b01b8749f913a@changeid \
--to=sjg@chromium.org \
--cc=bmeng.cn@gmail.com \
--cc=n-jain1@ti.com \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.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;
as well as URLs for NNTP newsgroup(s).