From e6c8f7ec200e72c76eb2ff73720acff9c88e73c8 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 9 Aug 2018 11:31:51 +0200 Subject: nb/intel/*/gma.c: Skip NGI when VGA decode is not enabled Writes to VGA MEM and IO by NGI are invalid if the IGD is not decoding them. Change-Id: I4b9329d14105eb563a0d4aea6ef75ff11febf6df Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/27984 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Felix Held --- src/northbridge/intel/haswell/gma.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/northbridge/intel/haswell/gma.c') diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c index 8ffdce84b2..8f60da4add 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -468,10 +468,17 @@ static void gma_func0_init(struct device *dev) /* Pre panel init */ gma_setup_panel(dev); + int vga_disable = (pci_read_config16(dev, GGC) & 2) >> 1; + if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) { - printk(BIOS_SPEW, "NATIVE graphics, run native enable\n"); - gma_gfxinit(&lightup_ok); - gfx_set_init_done(1); + if (vga_disable) { + printk(BIOS_INFO, + "IGD is not decoding legacy VGA MEM and IO: skipping NATIVE graphic init\n"); + } else { + printk(BIOS_SPEW, "NATIVE graphics, run native enable\n"); + gma_gfxinit(&lightup_ok); + gfx_set_init_done(1); + } } if (! lightup_ok) { -- cgit v1.2.3