GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X201: Fix native video init 

Due to recent restructuring X201 native video init has disappeared from
config options. Put it back and fix compilation with it.

Change-Id: I6d9ba5da196c093abd2df89a6fe5efefece1fb3c
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/4606
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Vladimir Serbinenko 2014-01-03 04:27:39 +01:00
parent 47777569d2
commit 503e4fef17
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mainboard/lenovo/x201/Kconfig
View File

@ -17,6 +17,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select EARLY_CBMEM_INIT select EARLY_CBMEM_INIT
select MAINBOARD_HAS_NATIVE_VGA_INIT
config MAINBOARD_DIR config MAINBOARD_DIR
string string

16
src/northbridge/intel/nehalem/gma.c
View File

@ -548,10 +548,12 @@ static void gma_pm_init_pre_vbios(struct device *dev)
#include <pc80/vga.h> #include <pc80/vga.h>
#include <pc80/vga_io.h> #include <pc80/vga_io.h>
#if CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT
static void fake_vbios(void) static void fake_vbios(void)
{ {
#include "fake_vbios.c" #include "fake_vbios.c"
} }
#endif
static void gma_pm_init_post_vbios(struct device *dev) static void gma_pm_init_post_vbios(struct device *dev)
{ {
@ -635,8 +637,8 @@ static void gma_func0_init(struct device *dev)
pci_dev_init(dev); pci_dev_init(dev);
#else #else
printk(BIOS_SPEW, "Initializing VGA without OPROM.\n"); printk(BIOS_SPEW, "Initializing VGA without OPROM.\n");
#endif
fake_vbios(); fake_vbios();
#endif
/* Linux relies on VBT for panel info. */ /* Linux relies on VBT for panel info. */
if (read16(0xc0000) != 0xaa55) { if (read16(0xc0000) != 0xaa55) {
@ -670,18 +672,6 @@ static void gma_func0_init(struct device *dev)
/* Post VBIOS init */ /* Post VBIOS init */
gma_pm_init_post_vbios(dev); gma_pm_init_post_vbios(dev);
#if CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT
/* This should probably run before post VBIOS init. */
u32 iobase, mmiobase, physbase, graphics_base;
iobase = dev->resource_list[2].base;
mmiobase = dev->resource_list[0].base;
physbase = pci_read_config32(dev, 0x5c) & ~0xf;
graphics_base = dev->resource_list[1].base;
int i915lightup(u32 physbase, u32 iobase, u32 mmiobase, u32 gfx);
i915lightup(physbase, iobase, mmiobase, graphics_base);
#endif
} }
static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device) static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device)