[PATCH 29/67] pci: video: Set up the pixel-format field

[Simon Glass]

Add this information to the handoff structure so that it is available to
U-Boot proper. Update bochs and the video handoff.

Signed-off-by: Simon Glass <s...@chromium.org>
---

 drivers/pci/pci_rom.c        | 3 +++
 drivers/video/bochs.c        | 1 +
 drivers/video/video-uclass.c | 1 +
 include/video.h              | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 2753df275ca..3697ad00be2 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -347,6 +347,7 @@ int vesa_setup_video_priv(struct vesa_mode_info *vesa, u64 
fb,
        case 32:
        case 24:
                uc_priv->bpix = VIDEO_BPP32;
+               uc_priv->format = VIDEO_X8B8G8R8;
                break;
        case 16:
                uc_priv->bpix = VIDEO_BPP16;
@@ -392,6 +393,7 @@ int vesa_setup_video(struct udevice *dev, int 
(*int15_handler)(void))
                uc_priv->ysize = ho->ysize;
                uc_priv->line_length = ho->line_length;
                uc_priv->bpix = ho->bpix;
+               uc_priv->format = ho->format;
        } else {
                bootstage_start(BOOTSTAGE_ID_ACCUM_LCD, "vesa display");
                ret = dm_pci_run_vga_bios(dev, int15_handler,
@@ -438,6 +440,7 @@ int vesa_setup_video(struct udevice *dev, int 
(*int15_handler)(void))
                ho->ysize = uc_priv->ysize;
                ho->line_length = uc_priv->line_length;
                ho->bpix = uc_priv->bpix;
+               ho->format = uc_priv->format;
        }
 
        return 0;
diff --git a/drivers/video/bochs.c b/drivers/video/bochs.c
index 00e673a4db0..c34bc23f274 100644
--- a/drivers/video/bochs.c
+++ b/drivers/video/bochs.c
@@ -64,6 +64,7 @@ static int bochs_init_fb(struct udevice *dev)
        uc_priv->xsize = xsize;
        uc_priv->ysize = ysize;
        uc_priv->bpix = VIDEO_BPP32;
+       uc_priv->format = VIDEO_X8B8G8R8;
 
        /* setup video mode */
        bochs_write(mmio, INDEX_ENABLE,  0);
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 407fb9fbe20..1e385f12f8e 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -616,6 +616,7 @@ static int video_post_probe(struct udevice *dev)
                ho->ysize = priv->ysize;
                ho->line_length = priv->line_length;
                ho->bpix = priv->bpix;
+               ho->format = priv->format;
        }
 
        if (IS_ENABLED(CONFIG_VIDEO_COPY) && plat->copy_base)
diff --git a/include/video.h b/include/video.h
index 0d7b0d27e25..2fe2f73a865 100644
--- a/include/video.h
+++ b/include/video.h
@@ -161,6 +161,7 @@ struct video_ops {
  *             set by the driver, but if not, the uclass will set it after
  *             probing
  * @bpix:      Encoded bits per pixel (enum video_log2_bpp)
+ * @format:    Video format (enum video_format)
  */
 struct video_handoff {
        u64 fb;
@@ -169,6 +170,7 @@ struct video_handoff {
        u16 ysize;
        u32 line_length;
        u8 bpix;
+       u8 format;
 };
 
 /** enum colour_idx - the 16 colors supported by consoles */
-- 
2.43.0