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: I350f85738efe3d17152de4f025adbfd52ae15b95 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/228882 Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
parent
dccd40a6c1
commit
f7ed93504a
1 changed files with 7 additions and 1 deletions
|
|
@ -32,6 +32,7 @@
|
|||
#include <soc/ramstage.h>
|
||||
#include <soc/systemagent.h>
|
||||
#include <soc/intel/broadwell/chip.h>
|
||||
#include <vendorcode/google/chromeos/chromeos.h>
|
||||
|
||||
#define GT_RETRY 1000
|
||||
#define GT_CDCLK_337 0
|
||||
|
|
@ -475,7 +476,6 @@ static void igd_init(struct device *dev)
|
|||
{
|
||||
int is_broadwell = !!(cpu_family_model() == BROADWELL_FAMILY_ULT);
|
||||
u32 rp1_gfx_freq;
|
||||
extern int oprom_is_loaded;
|
||||
|
||||
/* IGD needs to be Bus Master */
|
||||
u32 reg32 = pci_read_config32(dev, PCI_COMMAND);
|
||||
|
|
@ -487,7 +487,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) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue