gma: Re-structure TC port types
The `USBC1_DP/_HDMI' names did not draw an accurate picture. If
they are implemented as legacy ports (for HDMI always the case),
they don't show as USBC in schematics, the OS or anywhere else.
We also couldn't tell if a `USBCx_DP' was implemented as legacy
or USB-C.
We split them by actual, physical connector type now: HDMI, DP,
and USBC (for DP-Alt mode). The `_TCx' suffixes should provide
an idea where they are connected to a socket or SoC.
Tiger Lake and seemingly Alder Lake use the first 4 TC register
sets only. Hence we keep only 4 respective TC ports for now.
Also, as any of the 3 Combo-PHYs (DP1..3) can be used as eDP, we
map that to the port, that is used with the first set of panel-
control lines. This should hopefully match most board designs.
Change-Id: If9755fe8e1f9252e6e77e22fe910964ad3c3743b
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.sourcearcade.org/c/libgfxinit/+/456
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: Nico Huber <nico.h@gmx.de>
diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb
index 92c6f5e..f8eab45 100644
--- a/common/hw-gfx-gma.adb
+++ b/common/hw-gfx-gma.adb
@@ -52,31 +52,31 @@
is
pragma Disable_Atomic_Synchronization;
- subtype Port_Name is String (1 .. 10);
+ subtype Port_Name is String (1 .. 8);
type Port_Name_Array is array (Port_Type) of Port_Name;
Port_Names : constant Port_Name_Array :=
- (Disabled => "Disabled ",
- LVDS => "LVDS ",
- eDP => "eDP ",
- DP1 => "DP1 ",
- DP2 => "DP2 ",
- DP3 => "DP3 ",
- HDMI1 => "HDMI1 ",
- HDMI2 => "HDMI2 ",
- HDMI3 => "HDMI3 ",
- Analog => "Analog ",
- USBC1_DP => "USBC1-DP ",
- USBC2_DP => "USBC2-DP ",
- USBC3_DP => "USBC3-DP ",
- USBC4_DP => "USBC4-DP ",
- USBC5_DP => "USBC5-DP ",
- USBC6_DP => "USBC6-DP ",
- USBC1_HDMI => "USBC1-HDMI",
- USBC2_HDMI => "USBC2-HDMI",
- USBC3_HDMI => "USBC3-HDMI",
- USBC4_HDMI => "USBC4-HDMI",
- USBC5_HDMI => "USBC5-HDMI",
- USBC6_HDMI => "USBC6-HDMI");
+ (Disabled => "Disabled",
+ LVDS => "LVDS ",
+ eDP => "eDP ",
+ DP1 => "DP1 ",
+ DP2 => "DP2 ",
+ DP3 => "DP3 ",
+ DP_TC1 => "DP_TC1 ",
+ DP_TC2 => "DP_TC2 ",
+ DP_TC3 => "DP_TC3 ",
+ DP_TC4 => "DP_TC4 ",
+ HDMI1 => "HDMI1 ",
+ HDMI2 => "HDMI2 ",
+ HDMI3 => "HDMI3 ",
+ HDMI_TC1 => "HDMI_TC1",
+ HDMI_TC2 => "HDMI_TC2",
+ HDMI_TC3 => "HDMI_TC3",
+ HDMI_TC4 => "HDMI_TC4",
+ Analog => "Analog ",
+ USBC1 => "USBC1 ",
+ USBC2 => "USBC2 ",
+ USBC3 => "USBC3 ",
+ USBC4 => "USBC4 ");
package Dev is new HW.PCI.Dev (PCI.Address'(0, 2, 0));