From: Simon Glass Date: Thu, 1 Jan 2015 23:18:02 +0000 (-0700) Subject: x86: ivybridge: Only run the Video BIOS when video is enabled X-Git-Tag: v2015.04-rc1~195^2~27 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d19ee5c27ec0c144bae294b4317e03738616a593;p=oweals%2Fu-boot.git x86: ivybridge: Only run the Video BIOS when video is enabled This takes about about 700ms on link when running natively and 900ms when running using the emulator. It is a waste of time if video is not enabled, so don't bother running the video BIOS in that case. We could add a command to run the video BIOS later when needed, but this is not considered at present. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- diff --git a/arch/x86/cpu/ivybridge/gma.c b/arch/x86/cpu/ivybridge/gma.c index 3d7f740273..cf4f87c4e3 100644 --- a/arch/x86/cpu/ivybridge/gma.c +++ b/arch/x86/cpu/ivybridge/gma.c @@ -15,6 +15,7 @@ #include #include #include +#include struct gt_powermeter { u16 reg; @@ -730,6 +731,9 @@ static int int15_handler(void) int gma_func0_init(pci_dev_t dev, struct pci_controller *hose, const void *blob, int node) { +#ifdef CONFIG_VIDEO + ulong start; +#endif void *gtt_bar; u32 reg32; int ret; @@ -745,8 +749,11 @@ int gma_func0_init(pci_dev_t dev, struct pci_controller *hose, if (ret) return ret; +#ifdef CONFIG_VIDEO + start = get_timer(0); ret = pci_run_vga_bios(dev, int15_handler, false); - + debug("BIOS ran in %lums\n", get_timer(start)); +#endif /* Post VBIOS init */ ret = gma_pm_init_post_vbios(gtt_bar, blob, node); if (ret)