nb/intel/nehalem,sandybridge: Hook up libgfxinit
Change-Id: I4288193c022cc0963b926b4b43834c222e41bb0d Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/16953 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
parent
542e9488bd
commit
88c6487c34
|
@ -1024,8 +1024,14 @@ static void gma_func0_init(struct device *dev)
|
||||||
&& lfb_res && lfb_res->base) {
|
&& lfb_res && lfb_res->base) {
|
||||||
printk(BIOS_SPEW, "Initializing VGA without OPROM. MMIO 0x%llx\n",
|
printk(BIOS_SPEW, "Initializing VGA without OPROM. MMIO 0x%llx\n",
|
||||||
gtt_res->base);
|
gtt_res->base);
|
||||||
intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
|
if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
|
||||||
pio_res->base, lfb_res->base);
|
int lightup_ok;
|
||||||
|
gma_gfxinit(gtt_res->base, lfb_res->base,
|
||||||
|
physbase, &lightup_ok);
|
||||||
|
} else {
|
||||||
|
intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
|
||||||
|
pio_res->base, lfb_res->base);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Linux relies on VBT for panel info. */
|
/* Linux relies on VBT for panel info. */
|
||||||
|
|
|
@ -603,8 +603,14 @@ static void gma_func0_init(struct device *dev)
|
||||||
physbase = pci_read_config32(dev, 0x5c) & ~0xf;
|
physbase = pci_read_config32(dev, 0x5c) & ~0xf;
|
||||||
graphics_base = dev->resource_list[1].base;
|
graphics_base = dev->resource_list[1].base;
|
||||||
|
|
||||||
int lightup_ok = i915lightup_sandy(&conf->gfx, physbase, iobase,
|
int lightup_ok;
|
||||||
mmiobase, graphics_base);
|
if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
|
||||||
|
gma_gfxinit((uintptr_t)mmiobase, graphics_base,
|
||||||
|
physbase, &lightup_ok);
|
||||||
|
} else {
|
||||||
|
lightup_ok = i915lightup_sandy(&conf->gfx, physbase,
|
||||||
|
iobase, mmiobase, graphics_base);
|
||||||
|
}
|
||||||
if (lightup_ok)
|
if (lightup_ok)
|
||||||
gfx_set_init_done(1);
|
gfx_set_init_done(1);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue