Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9461
-gerrit
commit 3278dbaef36757d5c2c80eeb533dc52599daae55 Author: Duncan Laurie dlaurie@chromium.org Date: Tue Oct 7 15:19:54 2014 -0700
broadwell: Skip DDI-A enable in S3 resume
DDI-A should not need re-enabled in the resume path, just the resume path when we did not execute VBIOS.
BUG=chrome-os-partner:28234 BRANCH=samus,auron TEST=build and boot on samus, test suspend+resume
Change-Id: I29d67591ac903bc1d712a956462bcf4a764ef2eb Signed-off-by: Stefan Reinauer reinauer@chromium.org Original-Commit-Id: c3fbeac10f3834a6d848154aa3449672871b13df Original-Change-Id: Iaf7d083c5c92c42b7a117e2d2c9546ada6bf5f76 Original-Signed-off-by: Duncan Laurie dlaurie@chromium.org Original-Reviewed-on: https://chromium-review.googlesource.com/221988 Original-Reviewed-by: Aaron Durbin adurbin@chromium.org --- src/soc/intel/broadwell/igd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/soc/intel/broadwell/igd.c b/src/soc/intel/broadwell/igd.c index 714a139..d8b51a3 100644 --- a/src/soc/intel/broadwell/igd.c +++ b/src/soc/intel/broadwell/igd.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
+#include <arch/acpi.h> #include <arch/io.h> #include <bootmode.h> #include <console/console.h> @@ -522,7 +523,7 @@ static void igd_init(struct device *dev) reg_script_run_on_dev(dev, haswell_late_init_script); }
- if (!gfx_get_init_done()) { + if (!gfx_get_init_done() && acpi_slp_type != 3) { /* * Enable DDI-A if the Option ROM did not execute: *