[coreboot-gerrit] New patch to review for coreboot: 539eacc broadwell: Skip pre-graphics delay in resume path

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9812

-gerrit

commit 539eaccc98abdcee150799489f71f4437410b532
Author: Duncan Laurie <dlaurie at chromium.org>
Date:   Fri Jan 30 16:33:43 2015 -0800

    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 at chromium.org>
    Original-Commit-Id: b44a7167532410fc44ca9df1c91c91aaf541ae49
    Original-Change-Id: Ic9f2cda71d8a567f57e863409f0f3fb98ab68bcf
    Original-Signed-off-by: Duncan Laurie <dlaurie at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/245116
    Original-Reviewed-by: Shawn N <shawnn at chromium.org>
---
 src/soc/intel/broadwell/igd.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/soc/intel/broadwell/igd.c b/src/soc/intel/broadwell/igd.c
index 4257ff3..86da0a9 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) {