[coreboot-gerrit] New patch to review for coreboot: a7e34ea PCI VGA ROM: Use acpi_is_wakeup_s3()
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Fri Jun 20 09:39:10 CEST 2014
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6075
-gerrit
commit a7e34ea42d557d7e0411198dec25b600061b6f6c
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Fri Jun 20 06:21:01 2014 +0300
PCI VGA ROM: Use acpi_is_wakeup_s3()
Change-Id: I6f9c992f1a68025ed18de57c5856b3bf9a673bfb
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/device/pci_device.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 3a54c2d..00a9a0c 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -687,14 +687,12 @@ static int should_run_oprom(struct device *dev)
static int should_load_oprom(struct device *dev)
{
-#if CONFIG_HAVE_ACPI_RESUME && !CONFIG_S3_VGA_ROM_RUN
/* If S3_VGA_ROM_RUN is disabled, skip running VGA option
* ROMs when coming out of an S3 resume.
*/
- if ((acpi_slp_type == 3) &&
+ if (!IS_ENABLED(CONFIG_S3_VGA_ROM_RUN) && acpi_is_wakeup_s3() &&
((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA))
return 0;
-#endif
if (IS_ENABLED(CONFIG_ALWAYS_LOAD_OPROM))
return 1;
if (should_run_oprom(dev))
More information about the coreboot-gerrit
mailing list