From b8a7b71e611fed87a41cc940baa1e42624f97657 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Mon, 10 Nov 2014 13:00:27 -0800 Subject: [PATCH] broadwell: Only do pre-graphics delay when running option rom This changes the broadwell graphics init path to only do the delay before initializing graphics when running chromeos if we are also going to execute the option rom. BUG=chrome-os-partner:33671 BRANCH=samus TEST=build and boot on samus Change-Id: Idb7d39b22f7f6dc3be6dfbd2fa3cc2e33d78a397 Signed-off-by: Stefan Reinauer Original-Commit-Id: f7ed93504a74760f16acb8fb3c6c57ac514b7260 Original-Change-Id: I350f85738efe3d17152de4f025adbfd52ae15b95 Original-Signed-off-by: Duncan Laurie Original-Reviewed-on: https://chromium-review.googlesource.com/228882 Original-Reviewed-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/9474 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/soc/intel/broadwell/igd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/soc/intel/broadwell/igd.c b/src/soc/intel/broadwell/igd.c index d8b51a3552..38189ddeeb 100644 --- a/src/soc/intel/broadwell/igd.c +++ b/src/soc/intel/broadwell/igd.c @@ -33,6 +33,7 @@ #include #include #include +#include #define GT_RETRY 1000 #define GT_CDCLK_337 0 @@ -487,7 +488,13 @@ static void igd_init(struct device *dev) return; /* Wait for any configured pre-graphics delay */ +#if IS_ENABLED(CONFIG_CHROMEOS) + if (developer_mode_enabled() || recovery_mode_enabled() || + vboot_wants_oprom()) + mdelay(CONFIG_PRE_GRAPHICS_DELAY); +#else mdelay(CONFIG_PRE_GRAPHICS_DELAY); +#endif /* Early init steps */ if (is_broadwell) {