sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This patch makes sure that VGA is initialized before it is used. Without

Browse Source 
this fix, LinuxBIOS crashes if the CONSOLE_LOG_LEVEL is high enough.

Additionally, The VGA option rom will be executed if either
CONFIG_PCI_ROM_RUN=1 or CONFIG_CONSOLE_VGA=1.

Signed-off-by: Roman Kononov <kononov195-lbl@yahoo.com>
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2587 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Roman Kononov
2007-04-06 18:34:39 +00:00
committed by Stefan Reinauer
parent ba43064d32
commit 778a42b129
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/devices/pci_device.c
View File

@@ -633,17 +633,39 @@ void pci_dev_set_subsystem(device_t dev, unsigned vendor, unsigned device)
void pci_dev_init(struct device *dev)
{
#if CONFIG_PCI_ROM_RUN == 1
#if CONFIG_CONSOLE_VGA == 1
extern int vga_inited;
#endif
#if CONFIG_PCI_ROM_RUN == 1 || CONFIG_CONSOLE_VGA == 1
struct rom_header *rom, *ram;
#if CONFIG_PCI_ROM_RUN != 1
/* We want to execute VGA option ROMs when CONFIG_CONSOLE_VGA
* is set but CONFIG_PCI_ROM_RUN is not. In this case we skip
* all other option ROM types.
*/
if (dev->class!=PCI_CLASS_DISPLAY_VGA)
return;
#endif
rom = pci_rom_probe(dev);
if (rom == NULL)
return;
ram = pci_rom_load(dev, rom);
if (ram == NULL)
return;
run_bios(dev, ram);
#if CONFIG_CONSOLE_VGA == 1
/* vga_inited is a trigger of the VGA console code.
*
* Only set it if we enabled VGA console, and if we
* just initialized a VGA card.
*/
vga_inited|=dev->class==PCI_CLASS_DISPLAY_VGA;
#endif
#endif
}