diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2015-01-30 16:33:43 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-21 08:09:18 +0200 |
| commit | 1e6b5915ce0e78cad0d31708423bf7a01589268a (patch) | |
| tree | a27fa2c72ca40dfeda702f5ffd61c462d6d1c449 | |
| parent | b2deb222152246ba9058a974326be47f2f2f2ae9 (diff) | |
broadwell: Skip pre-graphics delay in resume path
If the board is configured with a pre-graphics delay it should
be skipped in the resume path.
BUG=chrome-os-partner:28234
BRANCH=broadwell
TEST=measure resume time in dev mode to be same as normal mode
Change-Id: I5a4ad5bba9e5316c89f7935d8811759b041429d9
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: b44a7167532410fc44ca9df1c91c91aaf541ae49
Original-Change-Id: Ic9f2cda71d8a567f57e863409f0f3fb98ab68bcf
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/245116
Original-Reviewed-by: Shawn N <shawnn@chromium.org>
Reviewed-on: http://review.coreboot.org/9812
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | src/soc/intel/broadwell/igd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/soc/intel/broadwell/igd.c b/src/soc/intel/broadwell/igd.c index 4257ff3cf7..86da0a9cb2 100644 --- a/src/soc/intel/broadwell/igd.c +++ b/src/soc/intel/broadwell/igd.c @@ -30,6 +30,7 @@ #include <reg_script.h> #include <drivers/intel/gma/i915_reg.h> #include <soc/cpu.h> +#include <soc/pm.h> #include <soc/ramstage.h> #include <soc/systemagent.h> #include <soc/intel/broadwell/chip.h> @@ -488,13 +489,15 @@ static void igd_init(struct device *dev) return; /* Wait for any configured pre-graphics delay */ + if (acpi_slp_type != SLEEP_STATE_S3) { #if IS_ENABLED(CONFIG_CHROMEOS) - if (developer_mode_enabled() || recovery_mode_enabled() || - vboot_wants_oprom()) - mdelay(CONFIG_PRE_GRAPHICS_DELAY); + if (developer_mode_enabled() || recovery_mode_enabled() || + vboot_wants_oprom()) + mdelay(CONFIG_PRE_GRAPHICS_DELAY); #else - mdelay(CONFIG_PRE_GRAPHICS_DELAY); + mdelay(CONFIG_PRE_GRAPHICS_DELAY); #endif + } /* Early init steps */ if (is_broadwell) { |