X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=vgasrc%2Fbochsvga.c;h=9210004466b7a94c4cba0182e90d8eb7dd783b1c;hb=cfd7ef9d8b38d9706671a4e88d40dcc4ac922b6a;hp=6cbbf9c8fddff1ec4a2016fffaa56bb356928800;hpb=e6bc4c1c5817e9c2d1f55b5c0ad5167e93aed418;p=seabios.git

diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index 6cbbf9c..9210004 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -1,3 +1,11 @@
+// Bochs VGA interface to extended "VBE" modes
+//
+// Copyright (C) 2012  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2011  Julian Pidancet <julian.pidancet@citrix.com>
+//  Copyright (C) 2002 Jeroen Janssen
+//
+// This file may be distributed under the terms of the GNU LGPLv3 license.
+
 #include "vgabios.h" // struct vbe_modeinfo
 #include "vbe.h" // VBE_CAPABILITY_8BIT_DAC
 #include "bochsvga.h" // bochsvga_set_mode
@@ -8,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;
@@ -84,139 +97,100 @@ 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)
+struct vgamode_s *bochsvga_find_mode(int mode)
 {
-    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;
+    struct bochsvga_mode *m = bochsvga_modes;
+    for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)]; m++)
+        if (GET_GLOBAL(m->mode) == mode)
+            return &m->info;
+    return stdvga_find_mode(mode);
 }
 
-static u16 dispi_get_max_bpp(void)
+void
+bochsvga_list_modes(u16 seg, u16 *dest, u16 *last)
 {
-    u16 en;
-    u16 bpp;
+    struct bochsvga_mode *m = bochsvga_modes;
+    for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)] && dest<last; m++) {
+        u16 mode = GET_GLOBAL(m->mode);
+        if (mode == 0xffff)
+            continue;
+        SET_FARVAR(seg, *dest, mode);
+        dest++;
+    }
+    stdvga_list_modes(seg, dest, last);
+}
 
-    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);
+/****************************************************************
+ * Helper functions
+ ****************************************************************/
 
-    return bpp;
+int
+bochsvga_get_window(struct vgamode_s *vmode_g, int window)
+{
+    if (window != 0)
+        return -1;
+    return dispi_read(VBE_DISPI_INDEX_BANK);
 }
 
-/* Called only during POST */
 int
-bochsvga_init(void)
+bochsvga_set_window(struct vgamode_s *vmode_g, int window, int val)
 {
-    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");
+    if (window != 0)
+        return -1;
+    dispi_write(VBE_DISPI_INDEX_BANK, val);
+    if (dispi_read(VBE_DISPI_INDEX_BANK) != val)
         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)
-        lfb_addr = (pci_config_readl(bdf, PCI_BASE_ADDRESS_0)
-                    & PCI_BASE_ADDRESS_MEM_MASK);
-
-    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 detected. lfb_addr=%x\n", lfb_addr);
-
     return 0;
 }
 
-static int mode_valid(struct vgamode_s *vmode_g)
+int
+bochsvga_get_linelength(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 = width * height * DIV_ROUND_UP(depth, 8);
-
-    return width <= max_xres && depth <= max_bpp && mem <= max_mem;
+    return dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * vga_bpp(vmode_g) / 8;
 }
 
-struct vgamode_s *bochsvga_find_mode(int mode)
+int
+bochsvga_set_linelength(struct vgamode_s *vmode_g, int val)
 {
-    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;
-            return &m->info;
-        }
-    return stdvga_find_mode(mode);
+    stdvga_set_linelength(vmode_g, val);
+    int pixels = (val * 8) / vga_bpp(vmode_g);
+    dispi_write(VBE_DISPI_INDEX_VIRT_WIDTH, pixels);
+    return 0;
 }
 
-void
-bochsvga_list_modes(u16 seg, u16 *dest, u16 *last)
+int
+bochsvga_get_displaystart(struct vgamode_s *vmode_g)
 {
-    struct bochsvga_mode *m = bochsvga_modes;
-    for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)] && dest<last; m++) {
-        if (!mode_valid(&m->info))
-            continue;
-
-        dprintf(1, "VBE found mode %x valid.\n", GET_GLOBAL(m->mode));
-        SET_FARVAR(seg, *dest, GET_GLOBAL(m->mode));
-        dest++;
-    }
-
-    stdvga_list_modes(seg, dest, last);
+    int bpp = vga_bpp(vmode_g);
+    int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8;
+    int x = dispi_read(VBE_DISPI_INDEX_X_OFFSET);
+    int y = dispi_read(VBE_DISPI_INDEX_Y_OFFSET);
+    return x * bpp / 8 + linelength * y;
 }
 
-static void
-bochsvga_hires_enable(int enable)
+int
+bochsvga_set_displaystart(struct vgamode_s *vmode_g, int val)
 {
-    u16 flags = enable ?
-        VBE_DISPI_ENABLED |
-        VBE_DISPI_LFB_ENABLED |
-        VBE_DISPI_NOCLEARMEM : 0;
-
-    dispi_write(VBE_DISPI_INDEX_ENABLE, flags);
+    stdvga_set_displaystart(vmode_g, val);
+    int bpp = vga_bpp(vmode_g);
+    int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8;
+    dispi_write(VBE_DISPI_INDEX_X_OFFSET, (val % linelength) * 8 / bpp);
+    dispi_write(VBE_DISPI_INDEX_Y_OFFSET, val / linelength);
+    return 0;
 }
 
-static void
-bochsvga_clear_scr(void)
-{
-    u16 en;
 
-    en = dispi_read(VBE_DISPI_INDEX_ENABLE);
-    en &= ~VBE_DISPI_NOCLEARMEM;
-    dispi_write(VBE_DISPI_INDEX_ENABLE, en);
-}
+/****************************************************************
+ * Mode setting
+ ****************************************************************/
 
 int
 bochsvga_set_mode(struct vgamode_s *vmode_g, int flags)
 {
-    if (! is_bochsvga_mode(vmode_g)) {
-        bochsvga_hires_enable(0);
+    dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED);
+    if (! is_bochsvga_mode(vmode_g))
         return stdvga_set_mode(vmode_g, flags);
-    }
-
-    bochsvga_hires_enable(1);
 
     u8 depth = GET_GLOBAL(vmode_g->depth);
     if (depth == 4)
@@ -231,13 +205,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)
@@ -258,12 +234,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 / 16);
+
+    // 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;