<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27053">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gma config: Introduce Is_ULT<br><br>Change-Id: I545d74ba6cadb06479b29b85aa9dc2af2be564d6<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M common/hw-gfx-gma-config.ads.template<br>M common/skylake/hw-gfx-gma-connectors-ddi-buffers.adb<br>2 files changed, 14 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/53/27053/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template</span><br><span>index f743957..d082a1b 100644</span><br><span>--- a/common/hw-gfx-gma-config.ads.template</span><br><span>+++ b/common/hw-gfx-gma-config.ads.template</span><br><span>@@ -44,6 +44,7 @@</span><br><span> Internal_Is_EDP : constant Boolean := Internal_Display = DP;</span><br><span> Have_DVI_I : constant Boolean := Analog_I2C_Port /= PCH_DAC;</span><br><span> Has_Presence_Straps : constant Boolean := CPU /= Broxton;</span><br><span style="color: hsl(120, 100%, 40%);">+ Is_ULT : constant Boolean := CPU_Var = ULT;</span><br><span> </span><br><span> ----- CPU pipe: --------</span><br><span> Has_Tertiary_Pipe : constant Boolean := CPU >= Ivybridge;</span><br><span>@@ -76,7 +77,7 @@</span><br><span> Has_PCH : constant Boolean := CPU /= Broxton and CPU /= G45;</span><br><span> Has_PCH_DAC : constant Boolean := CPU in Ironlake .. Ivybridge or</span><br><span> (CPU in Haswell .. Broadwell</span><br><span style="color: hsl(0, 100%, 40%);">- and CPU_Var = Normal);</span><br><span style="color: hsl(120, 100%, 40%);">+ and not Is_ULT);</span><br><span> </span><br><span> Has_PCH_Aux_Channels : constant Boolean := CPU in Ironlake .. Broadwell;</span><br><span> </span><br><span>@@ -102,13 +103,13 @@</span><br><span> Has_Per_DDI_Clock_Sel : constant Boolean := CPU in Haswell .. Broadwell;</span><br><span> Has_HOTPLUG_CTL : constant Boolean := CPU in Haswell .. Broadwell;</span><br><span> Has_SHOTPLUG_CTL_A : constant Boolean := (CPU in Haswell .. Broadwell</span><br><span style="color: hsl(0, 100%, 40%);">- and CPU_Var = ULT) or</span><br><span style="color: hsl(120, 100%, 40%);">+ and Is_ULT) or</span><br><span> CPU >= Skylake;</span><br><span> </span><br><span> Has_DDI_PHYs : constant Boolean := CPU = Broxton;</span><br><span> </span><br><span> Has_DDI_D : constant Boolean := CPU >= Haswell and</span><br><span style="color: hsl(0, 100%, 40%);">- CPU_Var = Normal and</span><br><span style="color: hsl(120, 100%, 40%);">+ not Is_ULT and</span><br><span> not Has_DDI_PHYs;</span><br><span> Has_DDI_E : constant Boolean := -- might be disabled by x4 eDP</span><br><span> Has_DDI_D;</span><br><span>@@ -127,8 +128,7 @@</span><br><span> Has_PCH_GMBUS : constant Boolean := CPU >= Ironlake;</span><br><span> </span><br><span> ----- Power: -----------</span><br><span style="color: hsl(0, 100%, 40%);">- Has_IPS : constant Boolean := (CPU = Haswell and</span><br><span style="color: hsl(0, 100%, 40%);">- CPU_Var = ULT) or</span><br><span style="color: hsl(120, 100%, 40%);">+ Has_IPS : constant Boolean := (CPU = Haswell and Is_ULT) or</span><br><span> CPU = Broadwell;</span><br><span> Has_IPS_CTL_Mailbox : constant Boolean := CPU = Broadwell;</span><br><span> </span><br><span>@@ -208,10 +208,7 @@</span><br><span> Sandybridge |</span><br><span> Ivybridge => 125_000_000,</span><br><span> when Haswell |</span><br><span style="color: hsl(0, 100%, 40%);">- Broadwell => (if CPU_Var = Normal then</span><br><span style="color: hsl(0, 100%, 40%);">- 125_000_000</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- 24_000_000),</span><br><span style="color: hsl(120, 100%, 40%);">+ Broadwell => (if Is_ULT then 24_000_000 else 125_000_000),</span><br><span> when Broxton => Frequency_Type'First, -- none needed</span><br><span> when Skylake => 24_000_000);</span><br><span> </span><br><span>diff --git a/common/skylake/hw-gfx-gma-connectors-ddi-buffers.adb b/common/skylake/hw-gfx-gma-connectors-ddi-buffers.adb</span><br><span>index 34ee980..7439a25 100644</span><br><span>--- a/common/skylake/hw-gfx-gma-connectors-ddi-buffers.adb</span><br><span>+++ b/common/skylake/hw-gfx-gma-connectors-ddi-buffers.adb</span><br><span>@@ -101,15 +101,14 @@</span><br><span> else Config.Default_DDI_HDMI_Buffer_Translation);</span><br><span> begin</span><br><span> Trans :=</span><br><span style="color: hsl(0, 100%, 40%);">- (case Config.CPU_Var is</span><br><span style="color: hsl(0, 100%, 40%);">- when Normal =></span><br><span style="color: hsl(0, 100%, 40%);">- (if DDIA_Low_Voltage_Swing</span><br><span style="color: hsl(0, 100%, 40%);">- then Skylake_Trans_EDP</span><br><span style="color: hsl(0, 100%, 40%);">- else Skylake_Trans_DP),</span><br><span style="color: hsl(0, 100%, 40%);">- when ULT =></span><br><span style="color: hsl(0, 100%, 40%);">- (if DDIA_Low_Voltage_Swing</span><br><span style="color: hsl(0, 100%, 40%);">- then Skylake_U_Trans_EDP</span><br><span style="color: hsl(0, 100%, 40%);">- else Skylake_U_Trans_DP));</span><br><span style="color: hsl(120, 100%, 40%);">+ (if Config.Is_ULT then</span><br><span style="color: hsl(120, 100%, 40%);">+ (if DDIA_Low_Voltage_Swing</span><br><span style="color: hsl(120, 100%, 40%);">+ then Skylake_Trans_EDP</span><br><span style="color: hsl(120, 100%, 40%);">+ else Skylake_Trans_DP)</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ (if DDIA_Low_Voltage_Swing</span><br><span style="color: hsl(120, 100%, 40%);">+ then Skylake_U_Trans_EDP</span><br><span style="color: hsl(120, 100%, 40%);">+ else Skylake_U_Trans_DP));</span><br><span> if not DDIA_Low_Voltage_Swing then</span><br><span> Trans (18) := Skylake_Trans_HDMI (HDMI_Trans).Trans1;</span><br><span> Trans (19) := Skylake_Trans_HDMI (HDMI_Trans).Trans2;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27053">change 27053</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27053"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libgfxinit </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I545d74ba6cadb06479b29b85aa9dc2af2be564d6 </div>
<div style="display:none"> Gerrit-Change-Number: 27053 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>