Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / drivers / pci / pci_rom.c

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index ed2f61dfc33c67d363679ddf31772034578125a5..29113f795867b11de7dd2251b6f290ad9bc4913e 100644 (file)
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Google, Inc
  *
@@ -19,8 +20,6 @@
  * David Mosberger-Tang
  *
  * Copyright 1997 -- 1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
-
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>
@@ -31,22 +30,32 @@
 #include <pci.h>
 #include <pci_rom.h>
 #include <vbe.h>
+#include <video.h>
 #include <video_fb.h>
 #include <linux/screen_info.h>
 
+#ifdef CONFIG_X86
+#include <asm/acpi_s3.h>
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
 __weak bool board_should_run_oprom(struct udevice *dev)
 {
+#if defined(CONFIG_X86) && defined(CONFIG_HAVE_ACPI_RESUME)
+       if (gd->arch.prev_sleep_state == ACPI_S3) {
+               if (IS_ENABLED(CONFIG_S3_VGA_ROM_RUN))
+                       return true;
+               else
+                       return false;
+       }
+#endif
+
        return true;
 }
 
-static bool should_load_oprom(struct udevice *dev)
+__weak bool board_should_load_oprom(struct udevice *dev)
 {
-       if (IS_ENABLED(CONFIG_ALWAYS_LOAD_OPROM))
-               return 1;
-       if (board_should_run_oprom(dev))
-               return 1;
-
-       return 0;
+       return true;
 }
 
 __weak uint32_t board_map_oprom_vendev(uint32_t vendev)
@@ -192,47 +201,6 @@ static int pci_rom_load(struct pci_rom_header *rom_header,
 
 struct vbe_mode_info mode_info;
 
-int vbe_get_video_info(struct graphic_device *gdev)
-{
-#ifdef CONFIG_FRAMEBUFFER_SET_VESA_MODE
-       struct vesa_mode_info *vesa = &mode_info.vesa;
-
-       gdev->winSizeX = vesa->x_resolution;
-       gdev->winSizeY = vesa->y_resolution;
-
-       gdev->plnSizeX = vesa->x_resolution;
-       gdev->plnSizeY = vesa->y_resolution;
-
-       gdev->gdfBytesPP = vesa->bits_per_pixel / 8;
-
-       switch (vesa->bits_per_pixel) {
-       case 32:
-       case 24:
-               gdev->gdfIndex = GDF_32BIT_X888RGB;
-               break;
-       case 16:
-               gdev->gdfIndex = GDF_16BIT_565RGB;
-               break;
-       default:
-               gdev->gdfIndex = GDF__8BIT_INDEX;
-               break;
-       }
-
-       gdev->isaBase = CONFIG_SYS_ISA_IO_BASE_ADDRESS;
-       gdev->pciBase = vesa->phys_base_ptr;
-
-       gdev->frameAdrs = vesa->phys_base_ptr;
-       gdev->memSize = vesa->bytes_per_scanline * vesa->y_resolution;
-
-       gdev->vprBase = vesa->phys_base_ptr;
-       gdev->cprBase = vesa->phys_base_ptr;
-
-       return gdev->winSizeX ? 0 : -ENOSYS;
-#else
-       return -ENOSYS;
-#endif
-}
-
 void setup_video(struct screen_info *screen_info)
 {
        struct vesa_mode_info *vesa = &mode_info.vesa;
@@ -266,7 +234,7 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),
                        int exec_method)
 {
        struct pci_child_platdata *pplat = dev_get_parent_platdata(dev);
-       struct pci_rom_header *rom, *ram = NULL;
+       struct pci_rom_header *rom = NULL, *ram = NULL;
        int vesa_mode = -1;
        bool emulate, alloced;
        int ret;
@@ -278,7 +246,7 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),
                return -ENODEV;
        }
 
-       if (!should_load_oprom(dev))
+       if (!board_should_load_oprom(dev))
                return -ENXIO;
 
        ret = pci_rom_probe(dev, &rom);
@@ -328,17 +296,17 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),
 #ifdef CONFIG_BIOSEMU
                BE_VGAInfo *info;
 
-               ret = biosemu_setup(dm_pci_get_bdf(dev), &info);
+               ret = biosemu_setup(dev, &info);
                if (ret)
                        goto err;
                biosemu_set_interrupt_handler(0x15, int15_handler);
-               ret = biosemu_run(dm_pci_get_bdf(dev), (uchar *)ram, 1 << 16,
-                                 info, true, vesa_mode, &mode_info);
+               ret = biosemu_run(dev, (uchar *)ram, 1 << 16, info,
+                                 true, vesa_mode, &mode_info);
                if (ret)
                        goto err;
 #endif
        } else {
-#ifdef CONFIG_X86
+#if defined(CONFIG_X86) && CONFIG_IS_ENABLED(X86_32BIT_INIT)
                bios_set_interrupt_handler(0x15, int15_handler);
 
                bios_run_on_x86(dev, (unsigned long)ram, vesa_mode,
@@ -353,3 +321,62 @@ err:
                free(ram);
        return ret;
 }
+
+#ifdef CONFIG_DM_VIDEO
+int vbe_setup_video_priv(struct vesa_mode_info *vesa,
+                        struct video_priv *uc_priv,
+                        struct video_uc_platdata *plat)
+{
+       if (!vesa->x_resolution)
+               return -ENXIO;
+       uc_priv->xsize = vesa->x_resolution;
+       uc_priv->ysize = vesa->y_resolution;
+       switch (vesa->bits_per_pixel) {
+       case 32:
+       case 24:
+               uc_priv->bpix = VIDEO_BPP32;
+               break;
+       case 16:
+               uc_priv->bpix = VIDEO_BPP16;
+               break;
+       default:
+               return -EPROTONOSUPPORT;
+       }
+       plat->base = vesa->phys_base_ptr;
+       plat->size = vesa->bytes_per_scanline * vesa->y_resolution;
+
+       return 0;
+}
+
+int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void))
+{
+       struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
+       struct video_priv *uc_priv = dev_get_uclass_priv(dev);
+       int ret;
+
+       /* If we are running from EFI or coreboot, this can't work */
+       if (!ll_boot_init()) {
+               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 = vbe_setup_video_priv(&mode_info.vesa, uc_priv, plat);
+       if (ret) {
+               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);
+
+       return 0;
+}
+#endif