commit f2dd0499b65149c90c1d3ddaa034b9aaa9850e33
author Nico Huber <nico.h@gmx.de> Sun Oct 29 15:42:44 2017 +0100
committer Martin Roth <martinroth@google.com> Fri Jun 08 03:27:37 2018 +0000
tree 1bafd590236dcb6fe96b910864bdcedd1eafd371
parent b00bac707f308a2c9293c24ad735d1c4e1e9ab42

libgfxinit: Enable G45 support (for GM45/X4X)

Change-Id: Ia637d32ffaa5d280320955d34141eddc8b7df981
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/22222
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/drivers/intel/gma/Kconfig

diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig
index 9e2872b..1b9c2a6 100644
--- a/src/drivers/intel/gma/Kconfig
+++ b/src/drivers/intel/gma/Kconfig
@@ -65,9 +65,10 @@
 
 config GFX_GMA
 	def_bool y
-	depends on NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \
-		   || NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL \
-		   || SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE
+	depends on NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X \
+		|| NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \
+		|| NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL \
+		|| SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE
 	depends on MAINBOARD_HAS_LIBGFXINIT
 
 if GFX_GMA
@@ -80,6 +81,7 @@
 	default "Ivybridge" if NORTHBRIDGE_INTEL_IVYBRIDGE
 	default "Sandybridge" if NORTHBRIDGE_INTEL_SANDYBRIDGE
 	default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM
+	default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X
 
 config GFX_GMA_CPU_VARIANT
 	string
@@ -93,6 +95,7 @@
 
 config GFX_GMA_INTERNAL_IS_LVDS
 	bool
+	default y if NORTHBRIDGE_INTEL_GM45
 	default n
 
 config GFX_GMA_INTERNAL_PORT

src/northbridge/intel/gm45/gma.c

diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index f0171e6..606170c 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -35,6 +35,7 @@
 #include <drivers/intel/gma/opregion.h>
 #include <pc80/vga.h>
 #include <pc80/vga_io.h>
+#include <drivers/intel/gma/libgfxinit.h>
 
 #define BASE_FREQUENCY 96000
 
@@ -770,8 +771,12 @@
 	/* Post VBIOS init */
 	gma_pm_init_post_vbios(dev, edid_lvds.ascii_string);
 
-	if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT))
+	if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT)) {
 		gma_ngi(dev, &edid_lvds);
+	} else if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
+		int lightup_ok;
+		gma_gfxinit(&lightup_ok);
+	}
 
 	intel_gma_restore_opregion();
 }

src/northbridge/intel/x4x/gma.c

diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index 6c6f3a2..f38d64d 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -33,6 +33,7 @@
 #include <drivers/intel/gma/edid.h>
 #include <drivers/intel/gma/i915.h>
 #include <drivers/intel/gma/opregion.h>
+#include <drivers/intel/gma/libgfxinit.h>
 #include <pc80/vga.h>
 #include <pc80/vga_io.h>
 
@@ -411,6 +412,9 @@
 			return;
 		}
 		native_init(dev);
+	} else if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
+		int lightup_ok;
+		gma_gfxinit(&lightup_ok);
 	} else {
 		pci_dev_init(dev);
 	}