<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20821">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gma hsw+: Don't use DDI E if DDI A uses all lanes<br><br>DDI E shares its two lanes with DDI A. If DDI A is configured to use<br>all four lanes, DDI E is disabled. As DDI E is the only DDI that can<br>be configured in FDI mode to feed the PCH DAC, treat `Analog` as in-<br>valid in this configuration.<br><br>Change-Id: I94e9537c9f30d0cbf757b816f38d44e1b43805b3<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M common/haswell_shared/hw-gfx-gma-port_detect.adb<br>M common/hw-gfx-gma-config.ads.template<br>2 files changed, 11 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/21/20821/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/common/haswell_shared/hw-gfx-gma-port_detect.adb b/common/haswell_shared/hw-gfx-gma-port_detect.adb<br>index d8a1d07..1302cf0 100644<br>--- a/common/haswell_shared/hw-gfx-gma-port_detect.adb<br>+++ b/common/haswell_shared/hw-gfx-gma-port_detect.adb<br>@@ -19,6 +19,8 @@<br> package body HW.GFX.GMA.Port_Detect<br> is<br> <br>+ DDI_BUF_CTL_A_LANE_CAPABILITY_X4 : constant := 1 * 2 ** 4;<br>+<br> SFUSE_STRAP_CRT_DAC_CAP_DISABLE : constant := 1 * 2 ** 6;<br> <br> HOTPLUG_CTL_DDI_A_HPD_INPUT_ENABLE : constant := 1 * 2 ** 4;<br>@@ -55,6 +57,7 @@<br> <br> procedure Initialize<br> is<br>+ DDI_A_X4,<br> DAC_Disabled,<br> Internal_Detected,<br> DDI_Detected : Boolean;<br>@@ -71,13 +74,17 @@<br> DIGI_C => DP2,<br> DIGI_D => DP3);<br> begin<br>- if Config.Has_PCH_DAC then<br>+ if Config.Has_DDI_E and Config.Has_PCH_DAC then<br> -- PCH_DAC (_A)<br>+ Registers.Is_Set_Mask<br>+ (Register => Registers.DDI_BUF_CTL_A,<br>+ Mask => DDI_BUF_CTL_A_LANE_CAPABILITY_X4,<br>+ Result => DDI_A_X4);<br> Registers.Is_Set_Mask<br> (Register => Registers.SFUSE_STRAP,<br> Mask => SFUSE_STRAP_CRT_DAC_CAP_DISABLE,<br> Result => DAC_Disabled);<br>- Config.Valid_Port (Analog) := not DAC_Disabled;<br>+ Config.Valid_Port (Analog) := not (DDI_A_X4 or DAC_Disabled);<br> end if;<br> <br> if Config.Internal_Is_EDP then<br>diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template<br>index aba00bb..55696c7 100644<br>--- a/common/hw-gfx-gma-config.ads.template<br>+++ b/common/hw-gfx-gma-config.ads.template<br>@@ -91,6 +91,8 @@<br> Has_DDI_D : constant Boolean := CPU >= Haswell and<br> CPU_Var = Normal and<br> not Has_DDI_PHYs;<br>+ Has_DDI_E : constant Boolean := -- might be disabled by x4 eDP<br>+ Has_DDI_D;<br> <br> Has_Low_Voltage_Swing : constant Boolean := CPU >= Broxton;<br> <br></pre><p>To view, visit <a href="https://review.coreboot.org/20821">change 20821</a>. To unsubscribe, 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/20821"/><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: I94e9537c9f30d0cbf757b816f38d44e1b43805b3 </div>
<div style="display:none"> Gerrit-Change-Number: 20821 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>