summaryrefslogtreecommitdiff
path: root/src/northbridge/intel/x4x
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2020-04-26 19:46:35 +0200
committerNico Huber <nico.h@gmx.de>2020-05-27 21:35:16 +0000
commitdd597627295e0063e29ba43a0b2d6fdefb12c2c6 (patch)
tree05dc1402dd060b24e77ed4ce95b2ac21c6aa3e19 /src/northbridge/intel/x4x
parentdfdf102000584e38952122c74858e46fa69acc60 (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/x4x')
-rw-r--r--src/northbridge/intel/x4x/gma.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index 69b6f7103d..ecbd63e616 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -22,14 +22,10 @@
static void gma_func0_init(struct device *dev)
{
- 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);
+ if (!CONFIG(NO_GFX_INIT))
+ pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER);
/* configure GMBUSFREQ */
pci_update_config16(dev, 0xcc, ~0x1ff, 0xbc);