3rdparty/libgfxinit: Update submodule pointer

Changes allow to use the integrated panel logic (power sequen-
cing and backlight control) for more connectors. The Kconfigs
GFX_GMA_PANEL_1_PORT and GFX_GMA_PANEL_2_PORT can now be set
to any port, e.g.

  config GFX_GMA_PANEL_1_PORT
          default "DP3"

Now that the panel logic is not tied to the `Internal` port
choice anymore, we can properly split it into `LVDS` and `eDP`.

This also adds Comet Lake PCI IDs which should still work the
same as Kaby and Coffee Lake.

Change-Id: I78b1b458ca00714dcbe7753a7beb4fb05d69986b
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38921
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

70 files changed, 156 insertions, 86 deletions

diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit
-Subproject fe7985f2a0692bc773d470a92ec54d22d3c12e4
+Subproject cdbfce275777f2fd142e3a3c73469807a4c4020
diff --git a/Documentation/gfx/libgfxinit.md b/Documentation/gfx/libgfxinit.md
index 06083639067f..bb4528b958e1 100644
--- a/Documentation/gfx/libgfxinit.md
+++ b/Documentation/gfx/libgfxinit.md
@@ -65,11 +65,20 @@ board can initialize graphics through *libgfxinit*:
     select MAINBOARD_HAS_LIBGFXINIT
 
 Internal ports share some hardware blocks (e.g. backlight, panel
-power sequencer). Therefore, each board has to select either eDP
-or LVDS as the internal port, if any:
+power sequencer). Therefore, each system with an integrated panel
+should set `GFX_GMA_PANEL_1_PORT` to the respective port, e.g.:
 
-    select GFX_GMA_INTERNAL_IS_EDP	# the default, or
-    select GFX_GMA_INTERNAL_IS_LVDS
+    config GFX_GMA_PANEL_1_PORT
+            default "DP3"
+
+For the most common cases, LVDS and eDP, exists a shorthand, one
+can select either:
+
+    select GFX_GMA_PANEL_1_ON_EDP	# the default, or
+    select GFX_GMA_PANEL_1_ON_LVDS
+
+Some newer chips feature a second block of panel control logic.
+For this, `GFX_GMA_PANEL_2_PORT` can be set.
 
 Boards with a DVI-I connector share the DDC (I2C) pins for both
 analog and digital displays. In this case, *libgfxinit* needs to
@@ -96,7 +105,8 @@ You can select from the following Ports:
 
     type Port_Type is
       (Disabled,	-- optionally terminates the list
-       Internal,	-- either eDP or LVDS as selected in Kconfig
+       LVDS,
+       eDP,
        DP1,
        DP2,
        DP3,
@@ -112,8 +122,7 @@ both DPx and HDMIx should be listed.
 
 A good example is the mainboard Kontron/KTQM77, it features two
 DP++ ports (DP2/HDMI2, DP3/HDMI3), one DVI-I port (HDMI1/Analog),
-eDP and LVDS. Due to the constraints mentioned above, only one of
-eDP and LVDS can be enabled. It defines `ports` as follows:
+eDP and LVDS. It defines `ports` as follows:
 
     ports : constant Port_List :=
       (DP2,
@@ -122,7 +131,8 @@ eDP and LVDS can be enabled. It defines `ports` as follows:
        HDMI2,
        HDMI3,
        Analog,
-       Internal,
+       LVDS,
+       eDP,
        others => Disabled);
 
 The `GMA.gfxinit()` procedure probes for display EDIDs in the
diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig
index 207135139c4c..d57faa0fa8ec 100644
--- a/src/drivers/intel/gma/Kconfig
+++ b/src/drivers/intel/gma/Kconfig
@@ -74,13 +74,13 @@ config GFX_GMA
 	depends on MAINBOARD_USE_LIBGFXINIT || INTEL_GMA_LIBGFXINIT_EDID
 	select RAMSTAGE_LIBHWBASE
 
-config GFX_GMA_INTERNAL_IS_EDP
+config GFX_GMA_PANEL_1_ON_EDP
 	bool
 	depends on GFX_GMA || MAINBOARD_HAS_LIBGFXINIT
-	default n if GFX_GMA_INTERNAL_IS_LVDS
+	default n if GFX_GMA_PANEL_1_ON_LVDS
 	default y
 
-config GFX_GMA_INTERNAL_IS_LVDS
+config GFX_GMA_PANEL_1_ON_LVDS
 	bool
 	depends on GFX_GMA || MAINBOARD_HAS_LIBGFXINIT
 	default y if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_NEHALEM
@@ -102,11 +102,15 @@ config GFX_GMA_GENERATION
 	default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE
 	default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X
 
-config GFX_GMA_INTERNAL_PORT
+config GFX_GMA_PANEL_1_PORT
 	string
-	default "DP" if GFX_GMA_INTERNAL_IS_EDP
+	default "eDP" if GFX_GMA_PANEL_1_ON_EDP
 	default "LVDS"
 
+config GFX_GMA_PANEL_2_PORT
+	string
+	default "Disabled"
+
 config GFX_GMA_ANALOG_I2C_PORT
 	string
 	default "PCH_HDMI_B" if GFX_GMA_ANALOG_I2C_HDMI_B
diff --git a/src/drivers/intel/gma/libgfxinit.h b/src/drivers/intel/gma/libgfxinit.h
index c4a8a5b4d271..7a00b5cf65b1 100644
--- a/src/drivers/intel/gma/libgfxinit.h
+++ b/src/drivers/intel/gma/libgfxinit.h
@@ -16,7 +16,8 @@
 
 enum {
 	GMA_PORT_DISABLED,
-	GMA_PORT_INTERNAL,
+	GMA_PORT_LVDS,
+	GMA_PORT_EDP,
 	GMA_PORT_DP1,
 	GMA_PORT_DP2,
 	GMA_PORT_DP3,
diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig
index 627b421649e3..2f48e5045855 100644
--- a/src/mainboard/apple/macbookair4_2/Kconfig
+++ b/src/mainboard/apple/macbookair4_2/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SERIRQ_CONTINUOUS_MODE
 	select SOUTHBRIDGE_INTEL_BD82X6X
 	select SYSTEM_TYPE_LAPTOP
-	select GFX_GMA_INTERNAL_IS_EDP
+	select GFX_GMA_PANEL_1_ON_EDP
 	select MAINBOARD_HAS_LIBGFXINIT
 	select HAVE_CMOS_DEFAULT
 	select HAVE_OPTION_TABLE
diff --git a/src/mainboard/apple/macbookair4_2/gma-mainboard.ads b/src/mainboard/apple/macbookair4_2/gma-mainboard.ads
index e45320f36ea4..64f6981b3506 100644
--- a/src/mainboard/apple/macbookair4_2/gma-mainboard.ads
+++ b/src/mainboard/apple/macbookair4_2/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      eDP,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/google/auron/gma-mainboard.ads b/src/mainboard/google/auron/gma-mainboard.ads
index d110261be2c4..79ca0075f233 100644
--- a/src/mainboard/google/auron/gma-mainboard.ads
+++ b/src/mainboard/google/auron/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       HDMI1,
       DP1,
       DP2,
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 33a840fd8319..4e014558ca7f 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -18,7 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SERIRQ_CONTINUOUS_MODE	# Workaround for EC/KBC IRQ1.
 	select HAVE_IFD_BIN
 	select HAVE_ME_BIN
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select MAINBOARD_HAS_LIBGFXINIT
 	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
 
diff --git a/src/mainboard/google/butterfly/gma-mainboard.ads b/src/mainboard/google/butterfly/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/google/butterfly/gma-mainboard.ads
+++ b/src/mainboard/google/butterfly/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/google/eve/gma-mainboard.ads b/src/mainboard/google/eve/gma-mainboard.ads
index 87cdb5e7c06d..52f6783ddb09 100644
--- a/src/mainboard/google/eve/gma-mainboard.ads
+++ b/src/mainboard/google/eve/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       DP1,
       DP2,
       HDMI1,
diff --git a/src/mainboard/google/glados/gma-mainboard.ads b/src/mainboard/google/glados/gma-mainboard.ads
index 87cdb5e7c06d..52f6783ddb09 100644
--- a/src/mainboard/google/glados/gma-mainboard.ads
+++ b/src/mainboard/google/glados/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       DP1,
       DP2,
       HDMI1,
diff --git a/src/mainboard/google/link/gma-mainboard.ads b/src/mainboard/google/link/gma-mainboard.ads
index 41737255a68c..fae0b5b06eda 100644
--- a/src/mainboard/google/link/gma-mainboard.ads
+++ b/src/mainboard/google/link/gma-mainboard.ads
@@ -17,7 +17,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       DP3,
       HDMI3,
       others => Disabled);
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index c5b680c89b19..4afd76110e89 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE
 	# This board also feature sandy-bridge CPU's so must have LVDS
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select MAINBOARD_HAS_LIBGFXINIT
 	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
 
diff --git a/src/mainboard/google/parrot/gma-mainboard.ads b/src/mainboard/google/parrot/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/google/parrot/gma-mainboard.ads
+++ b/src/mainboard/google/parrot/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/google/poppy/gma-mainboard.ads b/src/mainboard/google/poppy/gma-mainboard.ads
index 87cdb5e7c06d..52f6783ddb09 100644
--- a/src/mainboard/google/poppy/gma-mainboard.ads
+++ b/src/mainboard/google/poppy/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       DP1,
       DP2,
       HDMI1,
diff --git a/src/mainboard/google/slippy/gma-mainboard.ads b/src/mainboard/google/slippy/gma-mainboard.ads
index cd5e2f51be12..e362f891abc7 100644
--- a/src/mainboard/google/slippy/gma-mainboard.ads
+++ b/src/mainboard/google/slippy/gma-mainboard.ads
@@ -22,7 +22,7 @@ private package GMA.Mainboard is
 
    ports : constant Port_List :=
      (HDMI1,
-      Internal,
+      eDP,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index f945cc031677..b0ab7f948be4 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_TPM1
 	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select HAVE_IFD_BIN
 	select HAVE_ME_BIN
 	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
diff --git a/src/mainboard/google/stout/gma-mainboard.ads b/src/mainboard/google/stout/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/google/stout/gma-mainboard.ads
+++ b/src/mainboard/google/stout/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
index 3c95e85e4a5f..c4a8662e814c 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
+++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
@@ -18,7 +18,7 @@ config BOARD_HP_2570P
 
 	select BOARD_HP_SNB_IVB_LAPTOPS
 	select BOARD_ROMSIZE_KB_16384
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_USES_IFD_GBE_REGION
@@ -29,7 +29,7 @@ config BOARD_HP_2760P
 
 	select BOARD_HP_SNB_IVB_LAPTOPS
 	select BOARD_ROMSIZE_KB_8192
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_USES_IFD_GBE_REGION
@@ -40,7 +40,7 @@ config BOARD_HP_8460P
 
 	select BOARD_HP_SNB_IVB_LAPTOPS
 	select BOARD_ROMSIZE_KB_8192
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_HAS_LPC_TPM
@@ -54,7 +54,7 @@ config BOARD_HP_8470P
 
 	select BOARD_HP_SNB_IVB_LAPTOPS
 	select BOARD_ROMSIZE_KB_16384
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_USES_IFD_GBE_REGION
@@ -75,7 +75,7 @@ config BOARD_HP_FOLIO_9470M
 
 	select BOARD_HP_SNB_IVB_LAPTOPS
 	select BOARD_ROMSIZE_KB_16384
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
@@ -89,7 +89,7 @@ config BOARD_HP_REVOLVE_810_G1
 	select BOARD_HP_SNB_IVB_LAPTOPS
 	select BOARD_ROMSIZE_KB_16384
 	select GENERIC_SPD_BIN
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_INT15
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_USES_IFD_GBE_REGION
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads
index 1944a24b025a..a272d3e0d88b 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads
@@ -26,7 +26,7 @@ private package GMA.Mainboard is
       HDMI1,
       HDMI3,
       Analog,
-      Internal,
+      LVDS,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads
index 430720aedbfc..bad712b4de72 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads
@@ -24,7 +24,7 @@ private package GMA.Mainboard is
      (DP1,
       HDMI1,
       Analog,
-      Internal,
+      LVDS,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads
index 01ae99aaaff9..fe4efa246847 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads
index 01ae99aaaff9..fe4efa246847 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads
index 01ae99aaaff9..fe4efa246847 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/intel/dg43gt/gma-mainboard.ads b/src/mainboard/intel/dg43gt/gma-mainboard.ads
index 7dab160abffc..43a7d89a3a59 100644
--- a/src/mainboard/intel/dg43gt/gma-mainboard.ads
+++ b/src/mainboard/intel/dg43gt/gma-mainboard.ads
@@ -24,7 +24,6 @@ private package GMA.Mainboard is
      (HDMI1,
       HDMI2,
       Analog,
-      Internal,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig
index 77775e6b8eac..a67fa9e13ef0 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_RESUME
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_ANALOG_I2C_HDMI_B
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select MAINBOARD_USES_IFD_GBE_REGION
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/kontron/ktqm77/gma-mainboard.ads b/src/mainboard/kontron/ktqm77/gma-mainboard.ads
index 66ce273d77a7..3ac3cd2769b2 100644
--- a/src/mainboard/kontron/ktqm77/gma-mainboard.ads
+++ b/src/mainboard/kontron/ktqm77/gma-mainboard.ads
@@ -21,7 +21,7 @@ private package GMA.Mainboard is
 
    -- For a three-pipe setup, bandwidth is shared between the 2nd and
    -- the 3rd pipe (if it's not eDP). Thus, probe ports that likely
-   -- have a high-resolution display attached first, `Internal` last.
+   -- have a high-resolution display attached first, `eDP` last.
 
    ports : constant Port_List :=
      (DP2,
@@ -30,7 +30,8 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal,
+      LVDS,
+      eDP,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig
index a300d167de67..6716606ee4bf 100644
--- a/src/mainboard/lenovo/l520/Kconfig
+++ b/src/mainboard/lenovo/l520/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_CMOS_DEFAULT
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select SERIRQ_CONTINUOUS_MODE
 	select SOUTHBRIDGE_INTEL_BD82X6X
 	select SYSTEM_TYPE_LAPTOP
diff --git a/src/mainboard/lenovo/l520/gma-mainboard.ads b/src/mainboard/lenovo/l520/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/lenovo/l520/gma-mainboard.ads
+++ b/src/mainboard/lenovo/l520/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig
index 662c9a5ad375..124890663093 100644
--- a/src/mainboard/lenovo/s230u/Kconfig
+++ b/src/mainboard/lenovo/s230u/Kconfig
@@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_RESUME
 	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select SERIRQ_CONTINUOUS_MODE
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
diff --git a/src/mainboard/lenovo/s230u/gma-mainboard.ads b/src/mainboard/lenovo/s230u/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/lenovo/s230u/gma-mainboard.ads
+++ b/src/mainboard/lenovo/s230u/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads b/src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads
index 8a72a31c6be0..3623d623f43e 100644
--- a/src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads
@@ -24,7 +24,7 @@ private package GMA.Mainboard is
      (DP1,
       HDMI1,
       Analog,
-      Internal,
+      LVDS,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads b/src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads
index 71d160087a56..9bf6352f7bf0 100644
--- a/src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads
@@ -26,7 +26,7 @@ private package GMA.Mainboard is
       DP2,
       HDMI2,
       Analog,
-      Internal,
+      LVDS,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads b/src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads
index 92702b2978ab..9ab80b59dd34 100644
--- a/src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads
@@ -24,7 +24,7 @@ private package GMA.Mainboard is
      (DP2,
       HDMI2,
       Analog,
-      Internal,
+      LVDS,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t410/gma-mainboard.ads b/src/mainboard/lenovo/t410/gma-mainboard.ads
index 9c2a3cb36921..b75db6c69357 100644
--- a/src/mainboard/lenovo/t410/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t410/gma-mainboard.ads
@@ -24,7 +24,7 @@ private package GMA.Mainboard is
      (DP2, -- DP++ connector on the dock
       HDMI2,
       Analog,
-      Internal,
+      LVDS,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index d26ad1714bf4..7c715ed843b5 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_USES_IFD_GBE_REGION
diff --git a/src/mainboard/lenovo/t420/gma-mainboard.ads b/src/mainboard/lenovo/t420/gma-mainboard.ads
index a19bf339fd8b..eb0936d810d4 100644
--- a/src/mainboard/lenovo/t420/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t420/gma-mainboard.ads
@@ -27,6 +27,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index 89f84fccd821..6af93ac887ab 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_RESUME
 	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
diff --git a/src/mainboard/lenovo/t420s/gma-mainboard.ads b/src/mainboard/lenovo/t420s/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/lenovo/t420s/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t420s/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig
index a73a1b222560..009377d78f5d 100644
--- a/src/mainboard/lenovo/t430/Kconfig
+++ b/src/mainboard/lenovo/t430/Kconfig
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select USE_NATIVE_RAMINIT
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_USES_IFD_GBE_REGION
 
diff --git a/src/mainboard/lenovo/t430/gma-mainboard.ads b/src/mainboard/lenovo/t430/gma-mainboard.ads
index a19bf339fd8b..eb0936d810d4 100644
--- a/src/mainboard/lenovo/t430/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t430/gma-mainboard.ads
@@ -27,6 +27,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index 5162e0568e0d..3ed0d0ecde8c 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS if BOARD_LENOVO_T430S
+	select GFX_GMA_PANEL_1_ON_LVDS if BOARD_LENOVO_T430S
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select DRIVERS_RICOH_RCE822 if BOARD_LENOVO_T431S
diff --git a/src/mainboard/lenovo/t430s/Makefile.inc b/src/mainboard/lenovo/t430s/Makefile.inc
index 425047fe4459..d9f54d5989dd 100644
--- a/src/mainboard/lenovo/t430s/Makefile.inc
+++ b/src/mainboard/lenovo/t430s/Makefile.inc
@@ -18,5 +18,5 @@ bootblock-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
 ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads
 subdirs-$(CONFIG_BOARD_LENOVO_T431S) += variants/$(VARIANT_DIR)/spd
diff --git a/src/mainboard/lenovo/t430s/variants/t430s/gma-mainboard.ads b/src/mainboard/lenovo/t430s/variants/t430s/gma-mainboard.ads
new file mode 100644
index 000000000000..61793e295af2
--- /dev/null
+++ b/src/mainboard/lenovo/t430s/variants/t430s/gma-mainboard.ads
@@ -0,0 +1,34 @@
+--
+-- Copyright (C) 2017 Bill XIE persmule@gmail.com
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+
+with HW.GFX.GMA;
+with HW.GFX.GMA.Display_Probing;
+
+use HW.GFX.GMA;
+use HW.GFX.GMA.Display_Probing;
+
+private package GMA.Mainboard is
+
+   ports : constant Port_List :=
+     (DP1,
+      DP2,
+      DP3,
+      HDMI1,
+      HDMI2,
+      HDMI3,
+      Analog,
+      LVDS,
+      others => Disabled);
+
+end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t430s/gma-mainboard.ads b/src/mainboard/lenovo/t430s/variants/t431s/gma-mainboard.ads
index 8cf5d2fe136b..4cc7433eaf05 100644
--- a/src/mainboard/lenovo/t430s/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t430s/variants/t431s/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      eDP,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t440p/gma-mainboard.ads b/src/mainboard/lenovo/t440p/gma-mainboard.ads
index d36cb82e3c3d..1626f88f5a1f 100644
--- a/src/mainboard/lenovo/t440p/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t440p/gma-mainboard.ads
@@ -24,7 +24,7 @@ private package GMA.Mainboard is
      (DP1, -- MiniDP
       DP2, -- dock, DP2-1 (DP/HDMI) and DP2-2 (DP/DVI)
       Analog,
-      Internal,
+      eDP,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index 6d31be2e6c4a..a628adc6461a 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -14,7 +14,7 @@ config BOARD_LENOVO_BASEBOARD_T520
 	select HAVE_CMOS_DEFAULT
 	select HAVE_ACPI_RESUME
 	select INTEL_INT15
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
diff --git a/src/mainboard/lenovo/t520/gma-mainboard.ads b/src/mainboard/lenovo/t520/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/lenovo/t520/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t520/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index 233d4d3f60a6..bef0dee118b5 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -18,7 +18,7 @@ config BOARD_LENOVO_BASEBOARD_T530
 	select MAINBOARD_HAS_TPM1
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select DRIVERS_RICOH_RCE822 if BOARD_LENOVO_W530
diff --git a/src/mainboard/lenovo/t530/gma-mainboard.ads b/src/mainboard/lenovo/t530/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/lenovo/t530/gma-mainboard.ads
+++ b/src/mainboard/lenovo/t530/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig
index 352be84050b2..29fda105f27f 100644
--- a/src/mainboard/lenovo/x131e/Kconfig
+++ b/src/mainboard/lenovo/x131e/Kconfig
@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select SERIRQ_CONTINUOUS_MODE
 	select INTEL_GMA_HAVE_VBT
 
diff --git a/src/mainboard/lenovo/x131e/gma-mainboard.ads b/src/mainboard/lenovo/x131e/gma-mainboard.ads
index 2df96b5b2b17..cd3b98d01de1 100644
--- a/src/mainboard/lenovo/x131e/gma-mainboard.ads
+++ b/src/mainboard/lenovo/x131e/gma-mainboard.ads
@@ -22,7 +22,7 @@ private package GMA.Mainboard is
    ports : constant Port_List :=
      (HDMI1,
       Analog,
-      Internal,
+      LVDS,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
index f49805c36aec..830ace427d11 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
@@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_GMA_HAVE_VBT
 
 	# Workaround for EC/KBC IRQ1.
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads b/src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads
index 99d0a28b9c0d..c9a3d47e8e34 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads
+++ b/src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads
@@ -25,7 +25,7 @@ private package GMA.Mainboard is
       HDMI1,
       HDMI2,
       HDMI3,
-      Internal,
+      LVDS,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/x200/gma-mainboard.ads b/src/mainboard/lenovo/x200/gma-mainboard.ads
index 92702b2978ab..9ab80b59dd34 100644
--- a/src/mainboard/lenovo/x200/gma-mainboard.ads
+++ b/src/mainboard/lenovo/x200/gma-mainboard.ads
@@ -24,7 +24,7 @@ private package GMA.Mainboard is
      (DP2,
       HDMI2,
       Analog,
-      Internal,
+      LVDS,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/x201/gma-mainboard.ads b/src/mainboard/lenovo/x201/gma-mainboard.ads
index 9c2a3cb36921..b75db6c69357 100644
--- a/src/mainboard/lenovo/x201/gma-mainboard.ads
+++ b/src/mainboard/lenovo/x201/gma-mainboard.ads
@@ -24,7 +24,7 @@ private package GMA.Mainboard is
      (DP2, -- DP++ connector on the dock
       HDMI2,
       Analog,
-      Internal,
+      LVDS,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index b20255e1cc43..7c4754dbbdea 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_USES_IFD_GBE_REGION
 
diff --git a/src/mainboard/lenovo/x220/gma-mainboard.ads b/src/mainboard/lenovo/x220/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/lenovo/x220/gma-mainboard.ads
+++ b/src/mainboard/lenovo/x220/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index 73dfdf6a10e8..b25d7cf8587a 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_USES_IFD_GBE_REGION
 
diff --git a/src/mainboard/lenovo/x230/gma-mainboard.ads b/src/mainboard/lenovo/x230/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/lenovo/x230/gma-mainboard.ads
+++ b/src/mainboard/lenovo/x230/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/packardbell/ms2290/gma-mainboard.ads b/src/mainboard/packardbell/ms2290/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/packardbell/ms2290/gma-mainboard.ads
+++ b/src/mainboard/packardbell/ms2290/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/purism/librem_bdw/gma-mainboard.ads b/src/mainboard/purism/librem_bdw/gma-mainboard.ads
index 1aba6151287e..750e46ec1010 100644
--- a/src/mainboard/purism/librem_bdw/gma-mainboard.ads
+++ b/src/mainboard/purism/librem_bdw/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       HDMI1,
       others => Disabled);
 
diff --git a/src/mainboard/purism/librem_skl/gma-mainboard.ads b/src/mainboard/purism/librem_skl/gma-mainboard.ads
index 1aba6151287e..750e46ec1010 100644
--- a/src/mainboard/purism/librem_skl/gma-mainboard.ads
+++ b/src/mainboard/purism/librem_skl/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       HDMI1,
       others => Disabled);
 
diff --git a/src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads b/src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads
index 4d55f2cbc84f..82c66e0035e1 100644
--- a/src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads
+++ b/src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       DP1,
       DP2,
       HDMI1,
diff --git a/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads b/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads
index c9d6a75030ae..bde759f75227 100644
--- a/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads
+++ b/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads
@@ -20,6 +20,6 @@ use HW.GFX.GMA.Display_Probing;
 
 private package GMA.Mainboard is
 
-   ports : constant Port_List := (Internal, HDMI3, others => Disabled);
+   ports : constant Port_List := (eDP, HDMI3, others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads b/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads
index 5f1bf50e777e..fe7487500bc1 100644
--- a/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads
+++ b/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads
@@ -22,7 +22,7 @@ private package GMA.Mainboard is
 
    -- For a three-pipe setup, bandwidth is shared between the 2nd and
    -- the 3rd pipe (if it's not eDP). Thus, probe ports that likely
-   -- have a high-resolution display attached first, `Internal` last.
+   -- have a high-resolution display attached first, `eDP` last.
 
    ports : constant Port_List :=
      (DP2,
@@ -30,7 +30,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal,
+      eDP,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 56304c934988..6e729215041c 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_OPTION_TABLE
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select SOUTHBRIDGE_INTEL_BD82X6X
 	select SUPERIO_SMSC_MEC1308
 	select HAVE_IFD_BIN
diff --git a/src/mainboard/samsung/lumpy/gma-mainboard.ads b/src/mainboard/samsung/lumpy/gma-mainboard.ads
index e45320f36ea4..105b231e4f94 100644
--- a/src/mainboard/samsung/lumpy/gma-mainboard.ads
+++ b/src/mainboard/samsung/lumpy/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/util/autoport/main.go b/util/autoport/main.go
index dbd891372306..e3c3fdfa062a 100644
--- a/util/autoport/main.go
+++ b/util/autoport/main.go
@@ -931,7 +931,8 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      eDP);
 
 end GMA.Mainboard;
 `)