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>
This commit is contained in:
@@ -496,15 +496,13 @@ static void igd_init(struct device *dev)
|
||||
|
||||
intel_gma_init_igd_opregion();
|
||||
|
||||
/* IGD needs to be Bus Master */
|
||||
u32 reg32 = pci_read_config32(dev, PCI_COMMAND);
|
||||
reg32 |= PCI_COMMAND_MASTER;
|
||||
pci_write_config32(dev, PCI_COMMAND, reg32);
|
||||
|
||||
gtt_res = find_resource(dev, PCI_BASE_ADDRESS_0);
|
||||
if (!gtt_res || !gtt_res->base)
|
||||
return;
|
||||
|
||||
if (!CONFIG(NO_GFX_INIT))
|
||||
pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER);
|
||||
|
||||
/* Wait for any configured pre-graphics delay */
|
||||
if (!acpi_is_wakeup_s3()) {
|
||||
#if CONFIG(CHROMEOS)
|
||||
|
@@ -45,10 +45,8 @@ static void gma_init(struct device *const dev)
|
||||
if (CONFIG(RUN_FSP_GOP))
|
||||
return;
|
||||
|
||||
/* IGD needs to Bus Master */
|
||||
u32 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);
|
||||
|
||||
if (CONFIG(MAINBOARD_USE_LIBGFXINIT)) {
|
||||
if (!acpi_is_wakeup_s3() && display_init_required()) {
|
||||
|
Reference in New Issue
Block a user