From a06689c7e7d88f74fd1d12f8f5055b5ea7bc741f Mon Sep 17 00:00:00 2001
From: Nico Huber <nico.h@gmx.de>
Date: Tue, 8 Oct 2019 20:56:41 +0200
Subject: intel/broadwell: Hook libgfxinit up

As VGA_ROM_RUN and libgfxinit are mutually exclusive in Kconfig,
we don't have to guard all the VGA BIOS if's and can assume
gfx_get_init_done() returns 0 until all the quirks are handled.
Then, we can run libgfxinit.

Change-Id: Id5d0c2c12b1ff8f95ba4e0223a3e9aff27547acd
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/20100
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/soc/intel/broadwell/igd.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/soc/intel/broadwell/igd.c b/src/soc/intel/broadwell/igd.c
index f4322bf70e..31476809dc 100644
--- a/src/soc/intel/broadwell/igd.c
+++ b/src/soc/intel/broadwell/igd.c
@@ -27,6 +27,7 @@
 #include <reg_script.h>
 #include <cbmem.h>
 #include <drivers/intel/gma/i915_reg.h>
+#include <drivers/intel/gma/libgfxinit.h>
 #include <drivers/intel/gma/opregion.h>
 #include <soc/cpu.h>
 #include <soc/nvs.h>
@@ -594,6 +595,12 @@ static void igd_init(struct device *dev)
 			  DDI_INIT_DISPLAY_DETECTED);
 	}
 
+	if (CONFIG(MAINBOARD_USE_LIBGFXINIT)) {
+		int lightup_ok;
+		gma_gfxinit(&lightup_ok);
+		gfx_set_init_done(lightup_ok);
+	}
+
 	intel_gma_restore_opregion();
 }
 
-- 
cgit v1.2.3