bochsvga: add edid support.

Read EDID blob from mmio bar, store in VBE_edid.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index 479582f1dd4e066de7c8ba50341b0876182f769f..fd5e586b00edfa2ca03f4516713aa62169fbc078 100644 (file)
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -325,19 +325,25 @@ bochsvga_setup(void)
         return 0;
 
     u32 lfb_addr = VBE_DISPI_LFB_PHYSICAL_ADDRESS;
+    u32 io_addr = 0;
     int bdf = GET_GLOBAL(VgaBDF);
     if (CONFIG_VGA_PCI && bdf >= 0) {
         u16 vendor = pci_config_readw(bdf, PCI_VENDOR_ID);
-        int barid;
+        int barid, bar;
         switch (vendor) {
         case 0x15ad: /* qemu vmware vga */
             barid = 1;
             break;
-        default: /* stdvga, qxl, virtio */
+        case 0x1234: /* stdvga */
+            bar = pci_config_readl(bdf, PCI_BASE_ADDRESS_2);
+            io_addr = bar & PCI_BASE_ADDRESS_IO_MASK;
+            barid = 0;
+            break;
+        default: /* qxl, virtio */
             barid = 0;
             break;
         }
-        u32 bar = pci_config_readl(bdf, PCI_BASE_ADDRESS_0 + barid * 4);
+        bar = pci_config_readl(bdf, PCI_BASE_ADDRESS_0 + barid * 4);
         lfb_addr = bar & PCI_BASE_ADDRESS_MEM_MASK;
         dprintf(1, "VBE DISPI: bdf %02x:%02x.%x, bar %d\n", pci_bdf_to_bus(bdf)
                 , pci_bdf_to_dev(bdf), pci_bdf_to_fn(bdf), barid);
@@ -373,5 +379,12 @@ bochsvga_setup(void)
         }
     }
 
+    if (io_addr) {
+        int i;
+        u8 *edid = (void*)(io_addr);
+        for (i = 0; i < sizeof(VBE_edid); i++)
+            SET_VGA(VBE_edid[i], readb(edid + i));
+    }
+
     return 0;
 }