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);
+ 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 detected. lfb_addr=%x\n", lfb_addr);
+ dprintf(1, "VBE DISPI: lfb_addr=%x, size %d MB\n",
+ lfb_addr, totalmem / 16);
return 0;
}
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);
+ 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;
}
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);
-}
-
int
bochsvga_get_window(struct vgamode_s *vmode_g, int window)
{
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);
-}
-
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)
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)
stdvga_grdc_mask(0x05, 0x20, 0x40);
}
- if (flags & MF_LINEARFB) {
- /* Linear frame buffer */
- /* XXX: ??? */
- }
- if (!(flags & MF_NOCLEARMEM)) {
- bochsvga_clear_scr();
- }
-
return 0;
}