gma: Rename ports Digital[123] => HDMI[123]
Before we had DP support, Digital just meant HDMI or DVI, but now it's
pretty confusing. Rename them to HDMI as it supersedes DVI.
Change-Id: Ie8b4c60ac60040aa5c725ffc9cd06aa164391756
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/17750
Reviewed-by: Reto Buerki <reet@codelabs.ch>
diff --git a/common/haswell_shared/hw-gfx-gma-port_detect.adb b/common/haswell_shared/hw-gfx-gma-port_detect.adb
index d815e05..9987aca 100644
--- a/common/haswell_shared/hw-gfx-gma-port_detect.adb
+++ b/common/haswell_shared/hw-gfx-gma-port_detect.adb
@@ -68,9 +68,9 @@
Digital_Port range DIGI_B .. DIGI_D;
type Digital_Port_To_GMA_Port is array (Ext_Digital_Port) of Port_Type;
To_HDMI_Port : constant Digital_Port_To_GMA_Port :=
- (DIGI_B => Digital1,
- DIGI_C => Digital2,
- DIGI_D => Digital3);
+ (DIGI_B => HDMI1,
+ DIGI_C => HDMI2,
+ DIGI_D => HDMI3);
To_DP_Port : constant Digital_Port_To_GMA_Port :=
(DIGI_B => DP1,
DIGI_C => DP2,
diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template
index 6ef5555..ca61b06 100644
--- a/common/hw-gfx-gma-config.ads.template
+++ b/common/hw-gfx-gma-config.ads.template
@@ -131,14 +131,14 @@
Haswell => Valid_Per_Port'
(Disabled => False,
Internal => Config.Internal_Display = DP,
- Digital3 => CPU_Var = Normal,
+ HDMI3 => CPU_Var = Normal,
DP3 => CPU_Var = Normal,
Analog => CPU_Var = Normal,
others => True),
Broadwell => Valid_Per_Port'
(Disabled => False,
Internal => Config.Internal_Display = DP,
- Digital3 => CPU_Var = Normal,
+ HDMI3 => CPU_Var = Normal,
DP3 => CPU_Var = Normal,
Analog => CPU_Var = Normal,
others => True),
diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb
index e020d90..0a92d1c 100644
--- a/common/hw-gfx-gma.adb
+++ b/common/hw-gfx-gma.adb
@@ -53,9 +53,9 @@
DP1 => "DP1 ",
DP2 => "DP2 ",
DP3 => "DP3 ",
- Digital1 => "Digital1",
- Digital2 => "Digital2",
- Digital3 => "Digital3",
+ HDMI1 => "HDMI1 ",
+ HDMI2 => "HDMI2 ",
+ HDMI3 => "HDMI3 ",
Analog => "Analog ");
package Display_Controller renames Pipe_Setup;
@@ -108,12 +108,12 @@
when Tertiary => DIGI_D)),
when Haswell .. Skylake => -- everything but VGA directly on CPU
(case Configs (Idx).Port is
- when Disabled => GPU_Port'First,
- when Internal => DIGI_A, -- LVDS not available
- when Digital1 | DP1 => DIGI_B,
- when Digital2 | DP2 => DIGI_C,
- when Digital3 | DP3 => DIGI_D,
- when Analog => DIGI_E));
+ when Disabled => GPU_Port'First,
+ when Internal => DIGI_A, -- LVDS not available
+ when HDMI1 | DP1 => DIGI_B,
+ when HDMI2 | DP2 => DIGI_C,
+ when HDMI3 | DP3 => DIGI_D,
+ when Analog => DIGI_E));
end To_GPU_Port;
function To_PCH_Port (Port : Active_Port_Type) return PCH_Port
@@ -123,9 +123,9 @@
(case Port is
when Internal => PCH_LVDS, -- will be ignored if Internal is DP
when Analog => PCH_DAC,
- when Digital1 => PCH_HDMI_B,
- when Digital2 => PCH_HDMI_C,
- when Digital3 => PCH_HDMI_D,
+ when HDMI1 => PCH_HDMI_B,
+ when HDMI2 => PCH_HDMI_C,
+ when HDMI3 => PCH_HDMI_D,
when DP1 => PCH_DP_B,
when DP2 => PCH_DP_C,
when DP3 => PCH_DP_D);
@@ -139,9 +139,9 @@
(case Port is
when Internal => Config.Internal_Display,
when Analog => VGA,
- when Digital1 |
- Digital2 |
- Digital3 => HDMI,
+ when HDMI1 |
+ HDMI2 |
+ HDMI3 => HDMI,
when DP1 |
DP2 |
DP3 => DP);
diff --git a/common/hw-gfx-gma.ads b/common/hw-gfx-gma.ads
index b7d0b47..de00962 100644
--- a/common/hw-gfx-gma.ads
+++ b/common/hw-gfx-gma.ads
@@ -43,9 +43,9 @@
DP1,
DP2,
DP3,
- Digital1,
- Digital2,
- Digital3,
+ HDMI1, -- or DVI
+ HDMI2, -- or DVI
+ HDMI3, -- or DVI
Analog);
type Port_List_Range is range 0 .. 7;
type Port_List is array (Port_List_Range) of Port_Type;
diff --git a/common/ironlake/hw-gfx-gma-port_detect.adb b/common/ironlake/hw-gfx-gma-port_detect.adb
index 1432568..e8cb3fa 100644
--- a/common/ironlake/hw-gfx-gma-port_detect.adb
+++ b/common/ironlake/hw-gfx-gma-port_detect.adb
@@ -63,9 +63,9 @@
type PCH_Port_To_GMA_Port is array (PCH_HDMI_Port) of Port_Type;
To_Digital_Port : constant PCH_Port_To_GMA_Port :=
- (PCH_HDMI_B => Digital1,
- PCH_HDMI_C => Digital2,
- PCH_HDMI_D => Digital3);
+ (PCH_HDMI_B => HDMI1,
+ PCH_HDMI_C => HDMI2,
+ PCH_HDMI_D => HDMI3);
To_DP_Port : constant PCH_Port_To_GMA_Port :=
(PCH_HDMI_B => DP1,
PCH_HDMI_C => DP2,
diff --git a/common/skylake/hw-gfx-gma-power_and_clocks_skylake.adb b/common/skylake/hw-gfx-gma-power_and_clocks_skylake.adb
index 8503435..5c9231e 100644
--- a/common/skylake/hw-gfx-gma-power_and_clocks_skylake.adb
+++ b/common/skylake/hw-gfx-gma-power_and_clocks_skylake.adb
@@ -194,23 +194,23 @@
when DDI_AE => Configs (Primary).Port = Internal or
Configs (Secondary).Port = Internal or
Configs (Tertiary).Port = Internal,
- when DDI_B => Configs (Primary).Port = Digital1 or
+ when DDI_B => Configs (Primary).Port = HDMI1 or
Configs (Primary).Port = DP1 or
- Configs (Secondary).Port = Digital1 or
+ Configs (Secondary).Port = HDMI1 or
Configs (Secondary).Port = DP1 or
- Configs (Tertiary).Port = Digital1 or
+ Configs (Tertiary).Port = HDMI1 or
Configs (Tertiary).Port = DP1,
- when DDI_C => Configs (Primary).Port = Digital2 or
+ when DDI_C => Configs (Primary).Port = HDMI2 or
Configs (Primary).Port = DP2 or
- Configs (Secondary).Port = Digital2 or
+ Configs (Secondary).Port = HDMI2 or
Configs (Secondary).Port = DP2 or
- Configs (Tertiary).Port = Digital2 or
+ Configs (Tertiary).Port = HDMI2 or
Configs (Tertiary).Port = DP2,
- when DDI_D => Configs (Primary).Port = Digital3 or
+ when DDI_D => Configs (Primary).Port = HDMI3 or
Configs (Primary).Port = DP3 or
- Configs (Secondary).Port = Digital3 or
+ Configs (Secondary).Port = HDMI3 or
Configs (Secondary).Port = DP3 or
- Configs (Tertiary).Port = Digital3 or
+ Configs (Tertiary).Port = HDMI3 or
Configs (Tertiary).Port = DP3,
when PW2 => (Configs (Primary).Port /= Disabled and
Configs (Primary).Port /= Internal) or