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>
This commit is contained in:
parent
b2deb22215
commit
1e6b5915ce
|
@ -30,6 +30,7 @@
|
||||||
#include <reg_script.h>
|
#include <reg_script.h>
|
||||||
#include <drivers/intel/gma/i915_reg.h>
|
#include <drivers/intel/gma/i915_reg.h>
|
||||||
#include <soc/cpu.h>
|
#include <soc/cpu.h>
|
||||||
|
#include <soc/pm.h>
|
||||||
#include <soc/ramstage.h>
|
#include <soc/ramstage.h>
|
||||||
#include <soc/systemagent.h>
|
#include <soc/systemagent.h>
|
||||||
#include <soc/intel/broadwell/chip.h>
|
#include <soc/intel/broadwell/chip.h>
|
||||||
|
@ -488,6 +489,7 @@ static void igd_init(struct device *dev)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* Wait for any configured pre-graphics delay */
|
/* Wait for any configured pre-graphics delay */
|
||||||
|
if (acpi_slp_type != SLEEP_STATE_S3) {
|
||||||
#if IS_ENABLED(CONFIG_CHROMEOS)
|
#if IS_ENABLED(CONFIG_CHROMEOS)
|
||||||
if (developer_mode_enabled() || recovery_mode_enabled() ||
|
if (developer_mode_enabled() || recovery_mode_enabled() ||
|
||||||
vboot_wants_oprom())
|
vboot_wants_oprom())
|
||||||
|
@ -495,6 +497,7 @@ static void igd_init(struct device *dev)
|
||||||
#else
|
#else
|
||||||
mdelay(CONFIG_PRE_GRAPHICS_DELAY);
|
mdelay(CONFIG_PRE_GRAPHICS_DELAY);
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
/* Early init steps */
|
/* Early init steps */
|
||||||
if (is_broadwell) {
|
if (is_broadwell) {
|
||||||
|
|
Loading…
Reference in New Issue