SeaBIOS September 2012

seabios@seabios.org

27 participants
112 discussions

[PATCH 0/6] vgabios: VBE int 15h EDID information
by Hiroshi Miura 07 Sep '12

07 Sep '12

Hi, It provide Int 15h extension for VESA VBE interface of bochsvga vgabios. A series of patch is started from Julian's proposal(*1) and implement dynamic construction of EDID data block. I tested it against Linux Mint 13(x86) guest on on Ubuntu 12.04(LTS)(x86_84) KVM/Qemu with git head. You can review changes in github. (*3) There was a suggestion to extend API in previous discussion(*1), but here is not one to do it. I'm trying it but not completed(*4) Even though it is not extend api, QEMU can provide preferred resolution and vgabios can generate EDID according to qemu request. I've also worked on vgabios project, and have already proposed.(*2,5) URLs: (*1) http://www.seabios.org/pipermail/seabios/2012-March/003343.html (*2) https://savannah.nongnu.org/bugs/?36666 (*3) https://github.com/miurahr/seabios/tree/for-seabios-devel (*4) https://github.com/miurahr/seabios/tree/boch-dispi-edid (*5) https://github.com/miurahr/vgabios first 2 patches are same as Julian's proposal Hiroshi Miura (6): vgasrc: Add skeleton for VBE function 15h (VBE/DDC Standard) bochsvga: Implement vbe 15h function vgabios: vbe 15h func returns constructed EDID vgabios: split out an EDID part to a single file vgabios: generate EDID of preferred resolution vgabios: bochs support ddc preferred mode Makefile | 3 +- src/vbe.h | 5 ++ vgasrc/bochsvga.c | 20 +++-- vgasrc/stdvga.c | 11 +++ vgasrc/stdvga.h | 2 + vgasrc/vbe.c | 34 +++++++++ vgasrc/vbe_edid.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++ vgasrc/vbe_edid.h | 142 +++++++++++++++++++++++++++++++++++ vgasrc/vgahw.h | 13 ++++ 9 files changed, 433 insertions(+), 9 deletions(-) create mode 100644 vgasrc/vbe_edid.c create mode 100644 vgasrc/vbe_edid.h -- 1.7.9.5

2 1

Re: [SeaBIOS] [Qemu-devel] [PATCH] add a boot parameter to set reboot timeout
by Amos Kong 07 Sep '12

07 Sep '12

On 06/09/12 20:46, Gleb Natapov wrote: > On Thu, Sep 06, 2012 at 08:39:24PM +0800, Amos Kong wrote: >> Added an option to let qemu transfer a configuration file to bios, >> "etc/boot-fail-wait", which could be specified by command >> -boot reboot-timeout=T >> T have a max value of 0xffff, unit is ms. >> >> With this option, guest will wait for a given time if not find >> bootabled device, then reboot. This feature need the new seabios's >> support. >> > IMO default should be no reboot just like before Seabios change. Seabios reboots in 60s by default. And I agree with you, will pass a '-1' to seabios by default, then the default behavior of qemu is no-reboot. Thanks, Amos >> Signed-off-by: Amos Kong <akong(a)redhat.com> >> --- >> hw/fw_cfg.c | 29 +++++++++++++++++++++++++++++ >> qemu-config.c | 3 +++ >> qemu-options.hx | 10 +++++++--- >> vl.c | 3 ++- >> 4 files changed, 41 insertions(+), 4 deletions(-) >> >> diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c >> index 7b3b576..a017184 100644 >> --- a/hw/fw_cfg.c >> +++ b/hw/fw_cfg.c >> @@ -183,6 +183,34 @@ static void fw_cfg_bootsplash(FWCfgState *s) >> } >> } >> >> +static void fw_cfg_reboot(FWCfgState *s) >> +{ >> + int reboot_timeout = -1; >> + char *p; >> + const char *temp; >> + >> + /* get user configuration */ >> + QemuOptsList *plist = qemu_find_opts("boot-opts"); >> + QemuOpts *opts = QTAILQ_FIRST(&plist->head); >> + if (opts != NULL) { >> + temp = qemu_opt_get(opts, "reboot-timeout"); >> + if (temp != NULL) { >> + p = (char *)temp; >> + reboot_timeout = strtol(p, (char **)&p, 10); >> + } >> + } >> + if (reboot_timeout >= 0) { >> + /* validate the input */ >> + if (reboot_timeout > 0xffff) { >> + error_report("reboot timeout is larger than 65535," >> + " force it to 65535."); >> + reboot_timeout = 0xffff; >> + } >> + fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup(&reboot_timeout, 4), >> + 4); >> + } >> +} >> + >> static void fw_cfg_write(FWCfgState *s, uint8_t value) >> { >> int arch = !!(s->cur_entry & FW_CFG_ARCH_LOCAL); >> @@ -497,6 +525,7 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, >> fw_cfg_add_i16(s, FW_CFG_MAX_CPUS, (uint16_t)max_cpus); >> fw_cfg_add_i16(s, FW_CFG_BOOT_MENU, (uint16_t)boot_menu); >> fw_cfg_bootsplash(s); >> + fw_cfg_reboot(s); >> >> s->machine_ready.notify = fw_cfg_machine_ready; >> qemu_add_machine_init_done_notifier(&s->machine_ready); >> diff --git a/qemu-config.c b/qemu-config.c >> index c05ffbc..b9f9e0f 100644 >> --- a/qemu-config.c >> +++ b/qemu-config.c >> @@ -638,6 +638,9 @@ QemuOptsList qemu_boot_opts = { >> }, { >> .name = "splash-time", >> .type = QEMU_OPT_STRING, >> + }, { >> + .name = "reboot-timeout", >> + .type = QEMU_OPT_STRING, >> }, >> { /*End of list */ } >> }, >> diff --git a/qemu-options.hx b/qemu-options.hx >> index 3c411c4..d50505b 100644 >> --- a/qemu-options.hx >> +++ b/qemu-options.hx >> @@ -339,13 +339,14 @@ ETEXI >> >> DEF("boot", HAS_ARG, QEMU_OPTION_boot, >> "-boot [order=drives][,once=drives][,menu=on|off]\n" >> - " [,splash=sp_name][,splash-time=sp_time]\n" >> + " [,splash=sp_name][,splash-time=sp_time][,reboot-timeout=rb_time]\n" >> " 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n)\n" >> " 'sp_name': the file's name that would be passed to bios as logo picture, if menu=on\n" >> - " 'sp_time': the period that splash picture last if menu=on, unit is ms\n", >> + " 'sp_time': the period that splash picture last if menu=on, unit is ms\n" >> + " 'rb_timeout': the timeout before guest reboot when boot failed, unit is ms\n", >> QEMU_ARCH_ALL) >> STEXI >> -@item -boot [order=@var{drives}][,once=@var{drives}][,menu=on|off][,splash=@var{sp_name}][,splash-time=@var{sp_time}] >> +@item -boot [order=@var{drives}][,once=@var{drives}][,menu=on|off][,splash=@var{sp_name}][,splash-time=@var{sp_time}][,reboot-timeout=@var{rb_timeout}] >> @findex -boot >> Specify boot order @var{drives} as a string of drive letters. Valid >> drive letters depend on the target achitecture. The x86 PC uses: a, b >> @@ -364,6 +365,9 @@ limitation: The splash file could be a jpeg file or a BMP file in 24 BPP >> format(true color). The resolution should be supported by the SVGA mode, so >> the recommended is 320x240, 640x480, 800x640. >> >> +A timeout could be passed to bios, guest will pause for @var{rb_timeout} ms >> +when boot failed, then reboot. >> + >> @example >> # try to boot from network first, then from hard disk >> qemu-system-i386 -boot order=nc >> diff --git a/vl.c b/vl.c >> index 7c577fa..1bd9931 100644 >> --- a/vl.c >> +++ b/vl.c >> @@ -2622,7 +2622,8 @@ int main(int argc, char **argv, char **envp) >> { >> static const char * const params[] = { >> "order", "once", "menu", >> - "splash", "splash-time", NULL >> + "splash", "splash-time", >> + "reboot-timeout", NULL >> }; >> char buf[sizeof(boot_devices)]; >> char *standard_boot_devices; >> -- >> 1.7.1 > > -- > Gleb. > -- Amos.

1 0

Re: [SeaBIOS] How much RAM is required?
by Markus Armbruster 06 Sep '12

06 Sep '12

"Fred ." <eldmannen(a)gmail.com> writes: > On Thu, Aug 9, 2012 at 10:15 AM, Markus Armbruster <armbru(a)redhat.com> wrote: >> "Kevin O'Connor" <kevin(a)koconnor.net> writes: >> >>> On Wed, Aug 08, 2012 at 01:50:13PM +0200, Markus Armbruster wrote: >>>> Watch this: >>>> >>>> $ qemu-system-x86_64 -nodefaults -vnc :0 -monitor stdio -m 16k >>>> QEMU 1.1.50 monitor - type 'help' for more information >>>> (qemu) qemu: fatal: Trying to execute code outside RAM or ROM at >>>> 0x0000000000004000 >>>> >>>> Admittedly a silly thing to try. I don't really expect SeaBIOS to work >>>> with 16KiB of RAM. But I'm curious: how much does it require? >>> >>> SeaBIOS requires a minimum of 1Meg of ram. I didn't even know one >>> could request less than 1meg of ram from QEMU. >> >> I'll cook up a QEMU patch to give it at least that much. > But QEMU may use other firmware/payload than SeaBIOS which might > require less than 1 MB of RAM. Good point. Could SeaBIOS fail more cleanly when it detects insufficient RAM?

3 5

[PATCH v3] add acpi pmtimer support
by Gerd Hoffmann 06 Sep '12

06 Sep '12

This patch makes seabios use the acpi pmtimer instead of tsc for timekeeping. The pmtimer has a fixed frequency and doesn't need calibration, thus it doesn't suffer from calibration errors due to a loaded host machine. [ v3: mask port ioport read ] [ v2: add CONFIG_PMTIMER ] Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/Kconfig | 6 ++++++ src/clock.c | 31 +++++++++++++++++++++++++++++++ src/pciinit.c | 5 +++++ src/util.h | 1 + 4 files changed, 43 insertions(+), 0 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 6de3e71..b5dd63b 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -222,6 +222,12 @@ menu "Hardware support" default y help Initialize the Memory Type Range Registers (on emulators). + config PMTIMER + depends on !COREBOOT + bool "Use ACPI timer" + default y + help + Use the ACPI timer instead of the TSC for timekeeping (on qemu). endmenu menu "BIOS interfaces" diff --git a/src/clock.c b/src/clock.c index 69e9f17..b4abf37 100644 --- a/src/clock.c +++ b/src/clock.c @@ -129,11 +129,42 @@ emulate_tsc(void) return ret; } +u16 pmtimer_ioport VAR16VISIBLE; +u32 pmtimer_wraps VARLOW; +u32 pmtimer_last VARLOW; + +void pmtimer_init(u16 ioport, u32 khz) +{ + if (!CONFIG_PMTIMER) + return; + dprintf(1, "Using pmtimer, ioport 0x%x, freq %d kHz\n", ioport, khz); + SET_GLOBAL(pmtimer_ioport, ioport); + SET_GLOBAL(cpu_khz, khz); +} + +static u64 pmtimer_get(void) +{ + u16 ioport = GET_GLOBAL(pmtimer_ioport); + u32 wraps = GET_LOW(pmtimer_wraps); + u32 pmtimer = inl(ioport); + + if (pmtimer < GET_LOW(pmtimer_last)) { + wraps++; + SET_LOW(pmtimer_wraps, wraps); + } + SET_LOW(pmtimer_last, pmtimer); + + dprintf(9, "pmtimer: %u:%u\n", wraps, pmtimer); + return (u64)wraps << 24 | pmtimer; +} + static u64 get_tsc(void) { if (unlikely(GET_GLOBAL(no_tsc))) return emulate_tsc(); + if (CONFIG_PMTIMER && GET_GLOBAL(pmtimer_ioport)) + return pmtimer_get(); return rdtscll(); } diff --git a/src/pciinit.c b/src/pciinit.c index 68f302a..31115ee 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -180,6 +180,9 @@ static const struct pci_device_id pci_class_tbl[] = { PCI_DEVICE_END, }; +/* PM Timer ticks per second (HZ) */ +#define PM_TIMER_FREQUENCY 3579545 + /* PIIX4 Power Management device (for ACPI) */ static void piix4_pm_init(struct pci_device *pci, void *arg) { @@ -191,6 +194,8 @@ static void piix4_pm_init(struct pci_device *pci, void *arg) pci_config_writeb(bdf, 0x80, 0x01); /* enable PM io space */ pci_config_writel(bdf, 0x90, PORT_SMB_BASE | 1); pci_config_writeb(bdf, 0xd2, 0x09); /* enable SMBus io space */ + + pmtimer_init(PORT_ACPI_PM_BASE + 0x08, PM_TIMER_FREQUENCY / 1000); } static const struct pci_device_id pci_device_tbl[] = { diff --git a/src/util.h b/src/util.h index 062eea3..7723bb1 100644 --- a/src/util.h +++ b/src/util.h @@ -282,6 +282,7 @@ void lpt_setup(void); // clock.c #define PIT_TICK_RATE 1193180 // Underlying HZ of PIT #define PIT_TICK_INTERVAL 65536 // Default interval for 18.2Hz timer +void pmtimer_init(u16 ioport, u32 khz); int check_tsc(u64 end); void timer_setup(void); void ndelay(u32 count); -- 1.7.1

2 2

[PATCH v2] add acpi pmtimer support
by Gerd Hoffmann 06 Sep '12

06 Sep '12

This patch makes seabios use the acpi pmtimer instead of tsc for timekeeping. The pmtimer has a fixed frequency and doesn't need calibration, thus it doesn't suffer from calibration errors due to a loaded host machine. [ v2: add CONFIG_PMTIMER ] Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/Kconfig | 6 ++++++ src/clock.c | 31 +++++++++++++++++++++++++++++++ src/pciinit.c | 5 +++++ src/util.h | 1 + 4 files changed, 43 insertions(+), 0 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 6de3e71..b5dd63b 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -222,6 +222,12 @@ menu "Hardware support" default y help Initialize the Memory Type Range Registers (on emulators). + config PMTIMER + depends on !COREBOOT + bool "Use ACPI timer" + default y + help + Use the ACPI timer instead of the TSC for timekeeping (on qemu). endmenu menu "BIOS interfaces" diff --git a/src/clock.c b/src/clock.c index 69e9f17..b4abf37 100644 --- a/src/clock.c +++ b/src/clock.c @@ -129,11 +129,42 @@ emulate_tsc(void) return ret; } +u16 pmtimer_ioport VAR16VISIBLE; +u32 pmtimer_wraps VARLOW; +u32 pmtimer_last VARLOW; + +void pmtimer_init(u16 ioport, u32 khz) +{ + if (!CONFIG_PMTIMER) + return; + dprintf(1, "Using pmtimer, ioport 0x%x, freq %d kHz\n", ioport, khz); + SET_GLOBAL(pmtimer_ioport, ioport); + SET_GLOBAL(cpu_khz, khz); +} + +static u64 pmtimer_get(void) +{ + u16 ioport = GET_GLOBAL(pmtimer_ioport); + u32 wraps = GET_LOW(pmtimer_wraps); + u32 pmtimer = inl(ioport); + + if (pmtimer < GET_LOW(pmtimer_last)) { + wraps++; + SET_LOW(pmtimer_wraps, wraps); + } + SET_LOW(pmtimer_last, pmtimer); + + dprintf(9, "pmtimer: %u:%u\n", wraps, pmtimer); + return (u64)wraps << 24 | pmtimer; +} + static u64 get_tsc(void) { if (unlikely(GET_GLOBAL(no_tsc))) return emulate_tsc(); + if (CONFIG_PMTIMER && GET_GLOBAL(pmtimer_ioport)) + return pmtimer_get(); return rdtscll(); } diff --git a/src/pciinit.c b/src/pciinit.c index 68f302a..31115ee 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -180,6 +180,9 @@ static const struct pci_device_id pci_class_tbl[] = { PCI_DEVICE_END, }; +/* PM Timer ticks per second (HZ) */ +#define PM_TIMER_FREQUENCY 3579545 + /* PIIX4 Power Management device (for ACPI) */ static void piix4_pm_init(struct pci_device *pci, void *arg) { @@ -191,6 +194,8 @@ static void piix4_pm_init(struct pci_device *pci, void *arg) pci_config_writeb(bdf, 0x80, 0x01); /* enable PM io space */ pci_config_writel(bdf, 0x90, PORT_SMB_BASE | 1); pci_config_writeb(bdf, 0xd2, 0x09); /* enable SMBus io space */ + + pmtimer_init(PORT_ACPI_PM_BASE + 0x08, PM_TIMER_FREQUENCY / 1000); } static const struct pci_device_id pci_device_tbl[] = { diff --git a/src/util.h b/src/util.h index 89e928c..1603a57 100644 --- a/src/util.h +++ b/src/util.h @@ -312,6 +312,7 @@ void lpt_setup(void); // clock.c #define PIT_TICK_RATE 1193180 // Underlying HZ of PIT #define PIT_TICK_INTERVAL 65536 // Default interval for 18.2Hz timer +void pmtimer_init(u16 ioport, u32 khz); int check_tsc(u64 end); void timer_setup(void); void ndelay(u32 count); -- 1.7.1

4 5

Re: [SeaBIOS] [PATCH 04/15] Report stdvga modes in VBE via int10 (AX = 4F00h)
by Kevin O'Connor 04 Sep '12

04 Sep '12

On Mon, Sep 03, 2012 at 06:59:32PM +0200, Christian Gmeiner wrote: > Am 03.09.2012 18:07 schrieb "Christian Gmeiner" <christian.gmeiner(a)gmail.com > >: > > > > 2012/9/3 Kevin O'Connor <kevin(a)koconnor.net>: > > > On Sat, Sep 01, 2012 at 05:12:55PM +0200, Christian Gmeiner wrote: > > >> As all supported graphic adapters are supporting VGA we should > > >> list them in int10 (AX = 4F00h). Also clext.c and bochsvga.c > > >> are haveing a function named like is_XXX_mode() which checks > > >> if its a default VGA mode or a VESA mode. If its a normal VGA > > >> mode stdvga_set_mode() gets called. > > > [...] > > >> void > > >> stdvga_list_modes(u16 seg, u16 *dest, u16 *last) > > >> { > > >> + int i; > > >> + for (i = 0; i < ARRAY_SIZE(vga_modes); i++) { > > >> + struct stdvga_mode_s *stdmode_g = &vga_modes[i]; > > >> + u16 mode = GET_GLOBAL(stdmode_g->mode); > > >> + if (mode == 0xffff) > > >> + continue; > > >> + SET_FARVAR(seg, *dest, mode); > > >> + dest++; > > >> + } > > >> + > > >> SET_FARVAR(seg, *dest, 0xffff); > > >> } > > > > > > This is a good idea. However, I don't think vbe_104f01() will > > > correctly handle all the standard vga modes as it is coded today. > > > > > > > I will have a closer look at it during my following patches. If you want > you > > can skip this patch. > > > > Maybe it would be better to use this patch and update vga_modes array to > reflect the modes we can do now. All the modes work in the sense that one can switch to them. (I've tested that.) However, I think that some modes (eg, cga) wont be represented correctly by vbe_104f01. -Kevin

2 1

[PATCH 01/15] Access DC registers via geode_mem[Read|Write]
by Christian Gmeiner 04 Sep '12

04 Sep '12

There is no reason to access the DC registers via VGA memory mapping if we could the access via memory. Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- vgasrc/geodevga.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index 5c6caf0..8ce9ed1 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -206,37 +206,33 @@ static void dc_unmap(void) ****************************************************************/ /* Set up the dc (display controller) portion of the geodelx -* The dc provides hardware support for VGA graphics -* for features not accessible from the VGA registers, -* the dc's pci bar can be mapped to a vga memory segment +* The dc provides hardware support for VGA graphics. */ static int dc_setup(void) { - u32 fb, dc_fb; - u16 seg; + u32 fb, dc_fb, dc_base; dprintf(2, "DC_SETUP\n"); - seg = dc_map(SEG_GRAPH); - dc_unlock(seg); + dc_base = pci_config_readl(GET_GLOBAL(VgaBDF), PCI_BASE_ADDRESS_2); + geode_memWrite(dc_base + DC_UNLOCK, 0x0, DC_LOCK_UNLOCK); /* zero memory config */ - dc_write(seg,DC_FB_ST_OFFSET,0x0); - dc_write(seg,DC_CB_ST_OFFSET,0x0); - dc_write(seg,DC_CURS_ST_OFFSET,0x0); + geode_memWrite(dc_base + DC_FB_ST_OFFSET, 0x0, 0x0); + geode_memWrite(dc_base + DC_CB_ST_OFFSET, 0x0, 0x0); + geode_memWrite(dc_base + DC_CURS_ST_OFFSET, 0x0, 0x0); /* read fb-bar from pci, then point dc to the fb base */ - dc_fb = dc_read(seg,DC_GLIU0_MEM_OFFSET); + dc_fb = geode_memRead(dc_base + DC_GLIU0_MEM_OFFSET); fb = pci_config_readl(GET_GLOBAL(VgaBDF), PCI_BASE_ADDRESS_0); if (fb!=dc_fb) { - dc_write(seg,DC_GLIU0_MEM_OFFSET,fb); + geode_memWrite(dc_base + DC_GLIU0_MEM_OFFSET, 0x0, fb); } - dc_set(seg,DC_DISPLAY_CFG,DC_CFG_MSK,DC_GDEN+DC_TRUP); - dc_set(seg,DC_GENERAL_CFG,0,DC_VGAE); + geode_memWrite(dc_base + DC_DISPLAY_CFG, DC_CFG_MSK, DC_GDEN+DC_TRUP); + geode_memWrite(dc_base + DC_GENERAL_CFG, 0, DC_VGAE); - dc_lock(seg); - dc_unmap(); + geode_memWrite(dc_base + DC_UNLOCK, 0x0, DC_LOCK_LOCK); return 0; } -- 1.7.11.rc2.5.g68f532f

2 25

Re: [SeaBIOS] [PATCH 08/15] Fix finding VESA mode
by Kevin O'Connor 04 Sep '12

04 Sep '12

On Mon, Sep 03, 2012 at 06:12:34PM +0200, Christian Gmeiner wrote: > 2012/9/3 Kevin O'Connor <kevin(a)koconnor.net>: > > On Sat, Sep 01, 2012 at 05:12:59PM +0200, Christian Gmeiner wrote: > >> With the current code the following happens: > >> > >> VBE mode info request: 4101 > >> VBE mode 4101 not found > >> get_mode failed. > >> > >> Looking at the provided mode (cx register) only bits 8-0 > >> define the video mode number. I am not sure if the current > >> code ever worked. > >> > >> Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> > >> --- > >> vgasrc/vbe.c | 17 ++++++++++++++++- > >> 1 file changed, 16 insertions(+), 1 deletion(-) > >> > >> diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c > >> index 227a244..af72324 100644 > >> --- a/vgasrc/vbe.c > >> +++ b/vgasrc/vbe.c > >> @@ -72,9 +72,24 @@ vbe_104f01(struct bregs *regs) > >> struct vbe_mode_info *info = (void*)(regs->di+0); > >> u16 mode = regs->cx; > >> > >> + /* > >> + * Bitfields for VESA/VBE video mode number: > >> + * > >> + * Bit(s) Description (Table 04082) > >> + * 15 preserve display memory on mode change > >> + * 14 (VBE v2.0+) use linear (flat) frame buffer > >> + * 13 (VBE/AF 1.0P) VBE/AF initializes accelerator hardware > >> + * 12 reserved for VBE/AF > >> + * 11 (VBE v3.0) user user-specified CRTC refresh rate values > >> + * 10-9 reserved for future expansion > >> + * 8-0 video mode number (0xxh are non-VESA modes, 1xxh are VESA-defined) > >> + * > >> + * see http://www.ctyme.com/intr/rb-0274.htm > >> + */ > > > > This is true for the call to set mode (vbe_104f02), but the spec does > > not say this for the get mode info call (104f01). It would be odd to > > pass in these additional bits when the caller just wants to get info > > on the given mode. > > But if I want more information's about mode 0x101 with linear > framebuffer support - thats > the only way to get it. Also this is triggered by src/bootsplash.c so > it seems to be a valid > use-case. Okay - looking at this closer. It looks to me that what bootsplash is doing is wrong. However, it also looks like real vgabios will ignore the bits. So, I propose changing both bootsplash and the vbe code. Thanks. -Kevin >From c8a3d3ee0194f0bb76e7ec8eeb59d7b986c24016 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor <kevin(a)koconnor.net> Date: Mon, 3 Sep 2012 13:52:50 -0400 Subject: [PATCH 1/2] bootsplash: Don't pass mode flags to VBE get_mode_info call. To: seabios(a)seabios.org The spec doesn't specify one can pass flags into the get_mode_info call, so don't do that. Also, use the VBE_MODE_LINEAR_FRAME_BUFFER name where appropriate. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/bootsplash.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bootsplash.c b/src/bootsplash.c index a85e2b2..78023a5 100644 --- a/src/bootsplash.c +++ b/src/bootsplash.c @@ -11,7 +11,8 @@ #include "util.h" // dprintf #include "jpeg.h" // splash #include "vbe.h" // struct vbe_info -#include "bmp.h" +#include "bmp.h" // bmp_alloc + /**************************************************************** * Helper functions @@ -63,7 +64,7 @@ find_videomode(struct vbe_info *vesa_info, struct vbe_mode_info *mode_info struct bregs br; memset(&br, 0, sizeof(br)); br.ax = 0x4f01; - br.cx = (1 << 14) | videomode; + br.cx = videomode; br.di = FLATPTR_TO_OFFSET(mode_info); br.es = FLATPTR_TO_SEG(mode_info); call16_int10(&br); @@ -216,7 +217,7 @@ enable_bootsplash(void) dprintf(5, "Switching to graphics mode\n"); memset(&br, 0, sizeof(br)); br.ax = 0x4f02; - br.bx = (1 << 14) | videomode; + br.bx = videomode | VBE_MODE_LINEAR_FRAME_BUFFER; call16_int10(&br); if (br.ax != 0x4f) { dprintf(1, "set_mode failed.\n"); -- 1.7.11.4 >From ef4f9e183751df5ccd32eb5dda2ce6816b53695f Mon Sep 17 00:00:00 2001 From: Kevin O'Connor <kevin(a)koconnor.net> Date: Mon, 3 Sep 2012 13:54:28 -0400 Subject: [PATCH 2/2] vgabios: Ignore mode flags in vbe get_mode_info call. To: seabios(a)seabios.org Ignore any mode flags a caller may have set on the vbe get_mode_info call. The spec doesn't require ignoring of flags, but it appears at least some real-world vgabios vbe implementations do this. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- vgasrc/vbe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c index 227a244..01c8071 100644 --- a/vgasrc/vbe.c +++ b/vgasrc/vbe.c @@ -74,7 +74,7 @@ vbe_104f01(struct bregs *regs) dprintf(1, "VBE mode info request: %x\n", mode); - struct vgamode_s *vmode_g = vgahw_find_mode(mode); + struct vgamode_s *vmode_g = vgahw_find_mode(mode & ~MF_VBEFLAGS); if (! vmode_g) { dprintf(1, "VBE mode %x not found\n", mode); regs->ax = 0x014f; -- 1.7.11.4

2 1

Re: [SeaBIOS] [PATCH 04/15] Report stdvga modes in VBE via int10 (AX = 4F00h)
by Christian Gmeiner 03 Sep '12

03 Sep '12

Am 03.09.2012 18:07 schrieb "Christian Gmeiner" <christian.gmeiner(a)gmail.com >: > > 2012/9/3 Kevin O'Connor <kevin(a)koconnor.net>: > > On Sat, Sep 01, 2012 at 05:12:55PM +0200, Christian Gmeiner wrote: > >> As all supported graphic adapters are supporting VGA we should > >> list them in int10 (AX = 4F00h). Also clext.c and bochsvga.c > >> are haveing a function named like is_XXX_mode() which checks > >> if its a default VGA mode or a VESA mode. If its a normal VGA > >> mode stdvga_set_mode() gets called. > > [...] > >> void > >> stdvga_list_modes(u16 seg, u16 *dest, u16 *last) > >> { > >> + int i; > >> + for (i = 0; i < ARRAY_SIZE(vga_modes); i++) { > >> + struct stdvga_mode_s *stdmode_g = &vga_modes[i]; > >> + u16 mode = GET_GLOBAL(stdmode_g->mode); > >> + if (mode == 0xffff) > >> + continue; > >> + SET_FARVAR(seg, *dest, mode); > >> + dest++; > >> + } > >> + > >> SET_FARVAR(seg, *dest, 0xffff); > >> } > > > > This is a good idea. However, I don't think vbe_104f01() will > > correctly handle all the standard vga modes as it is coded today. > > > > I will have a closer look at it during my following patches. If you want you > can skip this patch. > Maybe it would be better to use this patch and update vga_modes array to reflect the modes we can do now. > --- > Christian Gmeiner, MSc

1 0

Re: [SeaBIOS] [PATCH 08/15] Fix finding VESA mode
by Kevin O'Connor 03 Sep '12

03 Sep '12

On Mon, Sep 03, 2012 at 06:12:34PM +0200, Christian Gmeiner wrote: > 2012/9/3 Kevin O'Connor <kevin(a)koconnor.net>: > > On Sat, Sep 01, 2012 at 05:12:59PM +0200, Christian Gmeiner wrote: > >> + * Bit(s) Description (Table 04082) > >> + * 15 preserve display memory on mode change > >> + * 14 (VBE v2.0+) use linear (flat) frame buffer > >> + * 13 (VBE/AF 1.0P) VBE/AF initializes accelerator hardware > >> + * 12 reserved for VBE/AF > >> + * 11 (VBE v3.0) user user-specified CRTC refresh rate values > >> + * 10-9 reserved for future expansion > >> + * 8-0 video mode number (0xxh are non-VESA modes, 1xxh are VESA-defined) > >> + * > >> + * see http://www.ctyme.com/intr/rb-0274.htm > >> + */ > > > > This is true for the call to set mode (vbe_104f02), but the spec does > > not say this for the get mode info call (104f01). It would be odd to > > pass in these additional bits when the caller just wants to get info > > on the given mode. > > But if I want more information's about mode 0x101 with linear > framebuffer support - thats > the only way to get it. Also this is triggered by src/bootsplash.c so > it seems to be a valid > use-case. Hrmm - it seems odd - I don't think one can get info with "linear framebuffer support". I don't see anything in the spec that indicates they can. Definitely odd that bootsplash is doing that. > > Does this mean you will not merge it? I want to understand it first. If this is the right thing to do, then of course I'll merge it. -Kevin

1 0

← Newer
1
...
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS September 2012