Nico Huber has uploaded this change for review. ( https://review.coreboot.org/27050
Change subject: gma config: Introduce Has_Broadwell_DDI_Bufs ......................................................................
gma config: Introduce Has_Broadwell_DDI_Bufs
Change-Id: I8b17825006d35ec19ebf3e5a276aefa4d326fd73 Signed-off-by: Nico Huber nico.h@gmx.de --- M common/haswell/hw-gfx-gma-connectors-ddi-buffers.adb M common/hw-gfx-gma-config.ads.template 2 files changed, 20 insertions(+), 21 deletions(-)
git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/50/27050/1
diff --git a/common/haswell/hw-gfx-gma-connectors-ddi-buffers.adb b/common/haswell/hw-gfx-gma-connectors-ddi-buffers.adb index baceb10..f345bc5 100644 --- a/common/haswell/hw-gfx-gma-connectors-ddi-buffers.adb +++ b/common/haswell/hw-gfx-gma-connectors-ddi-buffers.adb @@ -125,27 +125,25 @@ else Config.Default_DDI_HDMI_Buffer_Translation); begin Trans := - (case Config.CPU is - when Broadwell => - (case Port is - when DIGI_A => - (if Config.EDP_Low_Voltage_Swing - then Broadwell_Trans_EDP - else Broadwell_Trans_DP), - when DIGI_B .. DIGI_D => Broadwell_Trans_DP, - when DIGI_E => Broadwell_Trans_FDI), - when others => - (case Port is - when DIGI_A .. DIGI_D => Haswell_Trans_DP, - when DIGI_E => Haswell_Trans_FDI)); - case Config.CPU is - when Broadwell => - Trans (18) := Broadwell_Trans_HDMI (HDMI_Trans).Trans1; - Trans (19) := Broadwell_Trans_HDMI (HDMI_Trans).Trans2; - when others => - Trans (18) := Haswell_Trans_HDMI (HDMI_Trans).Trans1; - Trans (19) := Haswell_Trans_HDMI (HDMI_Trans).Trans2; - end case; + (if Config.Has_Broadwell_DDI_Bufs then + (case Port is + when DIGI_A => + (if Config.EDP_Low_Voltage_Swing + then Broadwell_Trans_EDP + else Broadwell_Trans_DP), + when DIGI_B .. DIGI_D => Broadwell_Trans_DP, + when DIGI_E => Broadwell_Trans_FDI) + else + (case Port is + when DIGI_A .. DIGI_D => Haswell_Trans_DP, + when DIGI_E => Haswell_Trans_FDI)); + if Config.Has_Broadwell_DDI_Bufs then + Trans (18) := Broadwell_Trans_HDMI (HDMI_Trans).Trans1; + Trans (19) := Broadwell_Trans_HDMI (HDMI_Trans).Trans2; + else + Trans (18) := Haswell_Trans_HDMI (HDMI_Trans).Trans1; + Trans (19) := Haswell_Trans_HDMI (HDMI_Trans).Trans2; + end if; end Translations;
end HW.GFX.GMA.Connectors.DDI.Buffers; diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template index af55575..7548ce5 100644 --- a/common/hw-gfx-gma-config.ads.template +++ b/common/hw-gfx-gma-config.ads.template @@ -113,6 +113,7 @@
Has_DDI_Buffer_Trans : constant Boolean := CPU >= Haswell and CPU /= Broxton; + Has_Broadwell_DDI_Bufs : constant Boolean := CPU = Broadwell; Has_Low_Voltage_Swing : constant Boolean := CPU >= Broxton; Has_Iboost_Config : constant Boolean := CPU >= Skylake;