summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-06-20 06:21:01 +0300
committerPatrick Georgi <patrick@georgi-clan.de>2014-06-21 08:04:55 +0200
commit58ceb00ea7a76040f9e4cada7073ee68a3b4455d (patch)
tree4ac15a352dd329d2a7ccc1bdc147f634ce612f44
parent9d9eb1ec8d6f30fa000aa87246310757214337d5 (diff)
downloadcoreboot-58ceb00ea7a76040f9e4cada7073ee68a3b4455d.tar.xz
PCI VGA ROM: Use acpi_is_wakeup_s3()
Change-Id: I6f9c992f1a68025ed18de57c5856b3bf9a673bfb Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/6075 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--src/device/pci_device.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 3a54c2d5c8..f262586232 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -30,6 +30,7 @@
#include <stdint.h>
#include <string.h>
#include <arch/io.h>
+#include <arch/acpi.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
@@ -53,9 +54,6 @@
#if CONFIG_PC80_SYSTEM
#include <pc80/i8259.h>
#endif
-#if CONFIG_HAVE_ACPI_RESUME && !CONFIG_S3_VGA_ROM_RUN
-#include <arch/acpi.h>
-#endif
#if CONFIG_CHROMEOS
#include <vendorcode/google/chromeos/chromeos.h>
#endif
@@ -687,14 +685,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))