summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2016-12-18 16:03:52 +0100
committerMartin Roth <martinroth@google.com>2016-12-20 23:56:47 +0100
commit23cda34782c69b70c23f04dbe5618727874cd394 (patch)
tree999911a096e0ba3ae6df33ac1bc3c0e5a2d5c8b2
parent7676730b9c470fc1acfe4dadda1c692e1188aebb (diff)
nb/intel/haswell: Hook up libgfxinit
Change-Id: I55e2d99b3f9929703f34d268f4490f3c5c2c766f Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/17915 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--src/northbridge/intel/haswell/gma.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 04fa6dacae..31e3cb68d9 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -459,8 +459,14 @@ static void gma_func0_init(struct device *dev)
#if IS_ENABLED(CONFIG_CHROMEOS)
init_fb = display_init_required();
#endif
- lightup_ok = panel_lightup(&dp, init_fb);
- gfx_set_init_done(1);
+ if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
+ gma_gfxinit(gtt_res->base, (u32)dp.graphics,
+ dp.physbase, &lightup_ok);
+ } else {
+ lightup_ok = panel_lightup(&dp, init_fb);
+ }
+
+ gfx_set_init_done(1);
#endif
if (! lightup_ok) {
printk(BIOS_SPEW, "FUI did not run; using VBIOS\n");