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> Reviewed-on: http://review.coreboot.org/9461 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
parent
1fad694953
commit
e86ac7e942
|
@ -17,6 +17,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <arch/acpi.h>
|
||||||
#include <arch/io.h>
|
#include <arch/io.h>
|
||||||
#include <bootmode.h>
|
#include <bootmode.h>
|
||||||
#include <console/console.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);
|
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:
|
* Enable DDI-A if the Option ROM did not execute:
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue