diff options
| author | Nico Huber <nico.h@gmx.de> | 2020-04-26 19:46:35 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2020-05-27 21:35:16 +0000 |
| commit | dd597627295e0063e29ba43a0b2d6fdefb12c2c6 (patch) | |
| tree | 05dc1402dd060b24e77ed4ce95b2ac21c6aa3e19 /src/northbridge/intel/haswell | |
| parent | dfdf102000584e38952122c74858e46fa69acc60 (diff) | |
intel/gma: Only enable bus mastering if we are going to use it
Also fix wrong 32-bit writes.
Change-Id: Ib038f0cd558223536da08ba2264774db11cd8357
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40727
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/northbridge/intel/haswell')
| -rw-r--r-- | src/northbridge/intel/haswell/gma.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c index fa67fe1982..19341d4d37 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -458,21 +458,18 @@ static void gma_enable_swsci(void) static void gma_func0_init(struct device *dev) { int lightup_ok = 0; - u32 reg32; intel_gma_init_igd_opregion(); - /* IGD needs to be Bus Master */ - reg32 = pci_read_config32(dev, PCI_COMMAND); - reg32 |= PCI_COMMAND_MASTER; - pci_write_config32(dev, PCI_COMMAND, reg32); - /* Init graphics power management */ gma_pm_init_pre_vbios(dev); /* Pre panel init */ gma_setup_panel(dev); + if (!CONFIG(NO_GFX_INIT)) + pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); + int vga_disable = (pci_read_config16(dev, GGC) & 2) >> 1; if (CONFIG(MAINBOARD_USE_LIBGFXINIT)) { |