From ea864f4a2d6ad85c97e78e36b8a30e605d3a5881 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Thu, 8 Jun 2017 13:37:29 +0200 Subject: soc/intel/skylake: Remove dead `CONFIG_PRE_GRAPHICS_DELAY` `CONFIG_PRE_GRAPHICS_DELAY` was only applied on a dead code path in `igd.c` that is guarded by always selected `CONFIG_ADD_VBT_DATA_FILE`. Nobody missed it for nearly a year, plus, it's not applied on the GOP path, let's drop it. Change-Id: I0b70cce3a3f2b50cb4e72c4d927b35510ff362a2 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/20111 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Patrick Rudolph Reviewed-by: Sumeet R Pawnikar Reviewed-by: Aaron Durbin --- src/soc/intel/skylake/Kconfig | 9 --------- src/soc/intel/skylake/igd.c | 10 ---------- 2 files changed, 19 deletions(-) (limited to 'src/soc/intel/skylake') diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index c558886584..af1381af7d 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -169,15 +169,6 @@ config PCR_BASE_ADDRESS help This option allows you to select MMIO Base Address of sideband bus. -config PRE_GRAPHICS_DELAY - int "Graphics initialization delay in ms" - default 0 - help - On some systems, coreboot boots so fast that connected monitors - (mostly TVs) won't be able to wake up fast enough to talk to the - VBIOS. On those systems we need to wait for a bit before executing - the VBIOS. - config SERIAL_CPU_INIT bool default n diff --git a/src/soc/intel/skylake/igd.c b/src/soc/intel/skylake/igd.c index 9304f6fe10..3f35489262 100644 --- a/src/soc/intel/skylake/igd.c +++ b/src/soc/intel/skylake/igd.c @@ -93,16 +93,6 @@ static void igd_init(struct device *dev) reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO; pci_write_config32(dev, PCI_COMMAND, reg32); - /* Wait for any configured pre-graphics delay */ - if (!acpi_is_wakeup_s3()) { -#if IS_ENABLED(CONFIG_CHROMEOS) - if (display_init_required() || vboot_wants_oprom()) - mdelay(CONFIG_PRE_GRAPHICS_DELAY); -#else - mdelay(CONFIG_PRE_GRAPHICS_DELAY); -#endif - } - /* Initialize PCI device, load/execute BIOS Option ROM */ pci_dev_init(dev); } -- cgit v1.2.3