GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2014-06-20 06:21:01 +03:00 committed by Patrick Georgi
parent 9d9eb1ec8d
commit 58ceb00ea7
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/device/pci_device.c
View File

@ -30,6 +30,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/acpi.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
@ -53,9 +54,6 @@
#if CONFIG_PC80_SYSTEM #if CONFIG_PC80_SYSTEM
#include <pc80/i8259.h> #include <pc80/i8259.h>
#endif #endif
#if CONFIG_HAVE_ACPI_RESUME && !CONFIG_S3_VGA_ROM_RUN
#include <arch/acpi.h>
#endif
#if CONFIG_CHROMEOS #if CONFIG_CHROMEOS
#include <vendorcode/google/chromeos/chromeos.h> #include <vendorcode/google/chromeos/chromeos.h>
#endif #endif
@ -687,14 +685,12 @@ static int should_run_oprom(struct device *dev)
static int should_load_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 /* If S3_VGA_ROM_RUN is disabled, skip running VGA option
* ROMs when coming out of an S3 resume. * 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)) ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA))
return 0; return 0;
#endif
if (IS_ENABLED(CONFIG_ALWAYS_LOAD_OPROM)) if (IS_ENABLED(CONFIG_ALWAYS_LOAD_OPROM))
return 1; return 1;
if (should_run_oprom(dev)) if (should_run_oprom(dev))