X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=vgasrc%2Fbochsvga.c;h=2a8aeb1865951970c86a81e7dcb264fc1eedb0e9;hb=refs%2Fheads%2Fcoreboot;hp=36688324c20951c6975de6f1e2bf6aec6aeefea2;hpb=3524453b5d5eca4ec352f099e0cc8419a1ac778d;p=seabios.git

diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index 3668832..2a8aeb1 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -16,6 +16,11 @@
 #include "pci.h" // pci_config_readl
 #include "pci_regs.h" // PCI_BASE_ADDRESS_0
 
+
+/****************************************************************
+ * Mode tables
+ ****************************************************************/
+
 static struct bochsvga_mode
 {
     u16 mode;
@@ -92,100 +97,12 @@ static int is_bochsvga_mode(struct vgamode_s *vmode_g)
             && vmode_g <= &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)-1].info);
 }
 
-static u16 dispi_get_max_xres(void)
-{
-    u16 en;
-    u16 xres;
-
-    en = dispi_read(VBE_DISPI_INDEX_ENABLE);
-
-    dispi_write(VBE_DISPI_INDEX_ENABLE, en | VBE_DISPI_GETCAPS);
-    xres = dispi_read(VBE_DISPI_INDEX_XRES);
-    dispi_write(VBE_DISPI_INDEX_ENABLE, en);
-
-    return xres;
-}
-
-static u16 dispi_get_max_bpp(void)
-{
-    u16 en;
-    u16 bpp;
-
-    en = dispi_read(VBE_DISPI_INDEX_ENABLE);
-
-    dispi_write(VBE_DISPI_INDEX_ENABLE, en | VBE_DISPI_GETCAPS);
-    bpp = dispi_read(VBE_DISPI_INDEX_BPP);
-    dispi_write(VBE_DISPI_INDEX_ENABLE, en);
-
-    return bpp;
-}
-
-/* Called only during POST */
-int
-bochsvga_init(void)
-{
-    int ret = stdvga_init();
-    if (ret)
-        return ret;
-
-    /* Sanity checks */
-    dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID0);
-    if (dispi_read(VBE_DISPI_INDEX_ID) != VBE_DISPI_ID0) {
-        dprintf(1, "No VBE DISPI interface detected\n");
-        return -1;
-    }
-
-    dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID5);
-
-    u32 lfb_addr = VBE_DISPI_LFB_PHYSICAL_ADDRESS;
-    int bdf = GET_GLOBAL(VgaBDF);
-    if (CONFIG_VGA_PCI && bdf >= 0) {
-        int barid = 0;
-        u32 bar = pci_config_readl(bdf, PCI_BASE_ADDRESS_0);
-        if ((bar & PCI_BASE_ADDRESS_SPACE) != PCI_BASE_ADDRESS_SPACE_MEMORY) {
-            barid = 1;
-            bar = pci_config_readl(bdf, PCI_BASE_ADDRESS_1);
-        }
-        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);
-    }
-
-    SET_VGA(VBE_framebuffer, lfb_addr);
-    u16 totalmem = dispi_read(VBE_DISPI_INDEX_VIDEO_MEMORY_64K);
-    SET_VGA(VBE_total_memory, totalmem * 64 * 1024);
-    SET_VGA(VBE_capabilities, VBE_CAPABILITY_8BIT_DAC);
-
-    dprintf(1, "VBE DISPI: lfb_addr=%x, size %d MB\n",
-            lfb_addr, totalmem / 16);
-
-    return 0;
-}
-
-static int mode_valid(struct vgamode_s *vmode_g)
-{
-    u16 max_xres = dispi_get_max_xres();
-    u16 max_bpp = dispi_get_max_bpp();
-    u32 max_mem = GET_GLOBAL(VBE_total_memory);
-
-    u16 width = GET_GLOBAL(vmode_g->width);
-    u16 height = GET_GLOBAL(vmode_g->height);
-    u8 depth = GET_GLOBAL(vmode_g->depth);
-    u32 mem = (height * DIV_ROUND_UP(width * vga_bpp(vmode_g), 8)
-               * 4 / stdvga_bpp_factor(vmode_g));
-
-    return width <= max_xres && depth <= max_bpp && mem <= max_mem;
-}
-
 struct vgamode_s *bochsvga_find_mode(int mode)
 {
     struct bochsvga_mode *m = bochsvga_modes;
     for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)]; m++)
-        if (GET_GLOBAL(m->mode) == mode) {
-            if (! mode_valid(&m->info))
-                return NULL;
+        if (GET_GLOBAL(m->mode) == mode)
             return &m->info;
-        }
     return stdvga_find_mode(mode);
 }
 
@@ -194,27 +111,19 @@ bochsvga_list_modes(u16 seg, u16 *dest, u16 *last)
 {
     struct bochsvga_mode *m = bochsvga_modes;
     for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)] && dest<last; m++) {
-        if (!mode_valid(&m->info))
+        u16 mode = GET_GLOBAL(m->mode);
+        if (mode == 0xffff)
             continue;
-
-        dprintf(1, "VBE found mode %x valid.\n", GET_GLOBAL(m->mode));
-        SET_FARVAR(seg, *dest, GET_GLOBAL(m->mode));
+        SET_FARVAR(seg, *dest, mode);
         dest++;
     }
-
     stdvga_list_modes(seg, dest, last);
 }
 
-static void
-bochsvga_hires_enable(int enable)
-{
-    u16 flags = enable ?
-        VBE_DISPI_ENABLED |
-        VBE_DISPI_LFB_ENABLED |
-        VBE_DISPI_NOCLEARMEM : 0;
 
-    dispi_write(VBE_DISPI_INDEX_ENABLE, flags);
-}
+/****************************************************************
+ * Helper functions
+ ****************************************************************/
 
 int
 bochsvga_get_window(struct vgamode_s *vmode_g, int window)
@@ -271,25 +180,103 @@ bochsvga_set_displaystart(struct vgamode_s *vmode_g, int val)
     return 0;
 }
 
-static void
-bochsvga_clear_scr(void)
+int
+bochsvga_get_dacformat(struct vgamode_s *vmode_g)
 {
-    u16 en;
+    u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE);
+    return (en & VBE_DISPI_8BIT_DAC) ? 8 : 6;
+}
 
-    en = dispi_read(VBE_DISPI_INDEX_ENABLE);
-    en &= ~VBE_DISPI_NOCLEARMEM;
+int
+bochsvga_set_dacformat(struct vgamode_s *vmode_g, int val)
+{
+    u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE);
+    if (val == 6)
+        en &= ~VBE_DISPI_8BIT_DAC;
+    else if (val == 8)
+        en |= VBE_DISPI_8BIT_DAC;
+    else
+        return -1;
     dispi_write(VBE_DISPI_INDEX_ENABLE, en);
+    return 0;
 }
 
 int
-bochsvga_set_mode(struct vgamode_s *vmode_g, int flags)
+bochsvga_size_state(int states)
 {
-    if (! is_bochsvga_mode(vmode_g)) {
-        bochsvga_hires_enable(0);
-        return stdvga_set_mode(vmode_g, flags);
+    int size = stdvga_size_state(states);
+    if (size < 0)
+        return size;
+    if (states & 8)
+        size += (VBE_DISPI_INDEX_Y_OFFSET-VBE_DISPI_INDEX_XRES+1)*sizeof(u16);
+    return size;
+}
+
+int
+bochsvga_save_state(u16 seg, void *data, int states)
+{
+    int ret = stdvga_save_state(seg, data, states);
+    if (ret < 0)
+        return ret;
+
+    if (!(states & 8))
+        return 0;
+
+    u16 *info = (data + stdvga_size_state(states));
+    u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE);
+    SET_FARVAR(seg, *info, en);
+    info++;
+    if (!(en & VBE_DISPI_ENABLED))
+        return 0;
+    int i;
+    for (i = VBE_DISPI_INDEX_XRES; i <= VBE_DISPI_INDEX_Y_OFFSET; i++)
+        if (i != VBE_DISPI_INDEX_ENABLE) {
+            u16 v = dispi_read(i);
+            SET_FARVAR(seg, *info, v);
+            info++;
+        }
+    return 0;
+}
+
+int
+bochsvga_restore_state(u16 seg, void *data, int states)
+{
+    int ret = stdvga_restore_state(seg, data, states);
+    if (ret < 0)
+        return ret;
+
+    if (!(states & 8))
+        return 0;
+
+    u16 *info = (data + stdvga_size_state(states));
+    u16 en = GET_FARVAR(seg, *info);
+    info++;
+    if (!(en & VBE_DISPI_ENABLED)) {
+        dispi_write(VBE_DISPI_INDEX_ENABLE, en);
+        return 0;
     }
+    int i;
+    for (i = VBE_DISPI_INDEX_XRES; i <= VBE_DISPI_INDEX_Y_OFFSET; i++)
+        if (i == VBE_DISPI_INDEX_ENABLE) {
+            dispi_write(i, en);
+        } else {
+            dispi_write(i, GET_FARVAR(seg, *info));
+            info++;
+        }
+    return 0;
+}
+
 
-    bochsvga_hires_enable(1);
+/****************************************************************
+ * Mode setting
+ ****************************************************************/
+
+int
+bochsvga_set_mode(struct vgamode_s *vmode_g, int flags)
+{
+    dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED);
+    if (! is_bochsvga_mode(vmode_g))
+        return stdvga_set_mode(vmode_g, flags);
 
     u8 depth = GET_GLOBAL(vmode_g->depth);
     if (depth == 4)
@@ -304,13 +291,15 @@ bochsvga_set_mode(struct vgamode_s *vmode_g, int flags)
     dispi_write(VBE_DISPI_INDEX_XRES, width);
     dispi_write(VBE_DISPI_INDEX_YRES, height);
     dispi_write(VBE_DISPI_INDEX_BANK, 0);
+    u16 bf = ((flags & MF_NOCLEARMEM ? VBE_DISPI_NOCLEARMEM : 0)
+              | (flags & MF_LINEARFB ? VBE_DISPI_LFB_ENABLED : 0));
+    dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED | bf);
 
     /* VGA compat setup */
-    //XXX: This probably needs some reverse engineering
     u16 crtc_addr = VGAREG_VGA_CRTC_ADDRESS;
     stdvga_crtc_write(crtc_addr, 0x11, 0x00);
     stdvga_crtc_write(crtc_addr, 0x01, width / 8 - 1);
-    dispi_write(VBE_DISPI_INDEX_VIRT_WIDTH, width);
+    stdvga_set_linelength(vmode_g, width);
     stdvga_crtc_write(crtc_addr, 0x12, height - 1);
     u8 v = 0;
     if ((height - 1) & 0x0100)
@@ -331,12 +320,73 @@ bochsvga_set_mode(struct vgamode_s *vmode_g, int flags)
         stdvga_grdc_mask(0x05, 0x20, 0x40);
     }
 
-    if (flags & MF_LINEARFB) {
-        /* Linear frame buffer */
-        /* XXX: ??? */
+    return 0;
+}
+
+
+/****************************************************************
+ * Init
+ ****************************************************************/
+
+int
+bochsvga_init(void)
+{
+    int ret = stdvga_init();
+    if (ret)
+        return ret;
+
+    /* Sanity checks */
+    dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID0);
+    if (dispi_read(VBE_DISPI_INDEX_ID) != VBE_DISPI_ID0) {
+        dprintf(1, "No VBE DISPI interface detected\n");
+        return -1;
+    }
+
+    dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID5);
+
+    if (GET_GLOBAL(HaveRunInit))
+        return 0;
+
+    u32 lfb_addr = VBE_DISPI_LFB_PHYSICAL_ADDRESS;
+    int bdf = GET_GLOBAL(VgaBDF);
+    if (CONFIG_VGA_PCI && bdf >= 0) {
+        int barid = 0;
+        u32 bar = pci_config_readl(bdf, PCI_BASE_ADDRESS_0);
+        if ((bar & PCI_BASE_ADDRESS_SPACE) != PCI_BASE_ADDRESS_SPACE_MEMORY) {
+            barid = 1;
+            bar = pci_config_readl(bdf, PCI_BASE_ADDRESS_1);
+        }
+        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);
     }
-    if (!(flags & MF_NOCLEARMEM)) {
-        bochsvga_clear_scr();
+
+    SET_VGA(VBE_framebuffer, lfb_addr);
+    u32 totalmem = dispi_read(VBE_DISPI_INDEX_VIDEO_MEMORY_64K) * 64 * 1024;
+    SET_VGA(VBE_total_memory, totalmem);
+    SET_VGA(VBE_capabilities, VBE_CAPABILITY_8BIT_DAC);
+
+    dprintf(1, "VBE DISPI: lfb_addr=%x, size %d MB\n",
+            lfb_addr, totalmem >> 20);
+
+    // Validate modes
+    u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE);
+    dispi_write(VBE_DISPI_INDEX_ENABLE, en | VBE_DISPI_GETCAPS);
+    u16 max_xres = dispi_read(VBE_DISPI_INDEX_XRES);
+    u16 max_bpp = dispi_read(VBE_DISPI_INDEX_BPP);
+    dispi_write(VBE_DISPI_INDEX_ENABLE, en);
+    struct bochsvga_mode *m = bochsvga_modes;
+    for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)]; m++) {
+        u16 width = GET_GLOBAL(m->info.width);
+        u16 height = GET_GLOBAL(m->info.height);
+        u8 depth = GET_GLOBAL(m->info.depth);
+        u32 mem = (height * DIV_ROUND_UP(width * vga_bpp(&m->info), 8)
+                   * 4 / stdvga_bpp_factor(&m->info));
+
+        if (width > max_xres || depth > max_bpp || mem > totalmem) {
+            dprintf(1, "Removing mode %x\n", GET_GLOBAL(m->mode));
+            SET_VGA(m->mode, 0xffff);
+        }
     }
 
     return 0;