<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25407">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add GPU_Port types that are convenient for GMCH to use<br><br>Change-Id: I9120d084637d36a7e2276fcf3f630b3f7ed32509<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M common/haswell_shared/hw-gfx-gma-connectors-ddi.ads<br>M common/haswell_shared/hw-gfx-gma-connectors.adb<br>M common/hw-gfx-gma-connector_info.adb<br>M common/hw-gfx-gma.ads<br>4 files changed, 25 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/07/25407/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/common/haswell_shared/hw-gfx-gma-connectors-ddi.ads b/common/haswell_shared/hw-gfx-gma-connectors-ddi.ads</span><br><span>index ec1fce2..d43db97 100644</span><br><span>--- a/common/haswell_shared/hw-gfx-gma-connectors-ddi.ads</span><br><span>+++ b/common/haswell_shared/hw-gfx-gma-connectors-ddi.ads</span><br><span>@@ -22,9 +22,14 @@</span><br><span> procedure Pre_On</span><br><span> (Port_Cfg : in Port_Config;</span><br><span> PLL_Hint : in Word32;</span><br><span style="color: hsl(0, 100%, 40%);">- Success : out Boolean);</span><br><span style="color: hsl(120, 100%, 40%);">+ Success : out Boolean)</span><br><span style="color: hsl(120, 100%, 40%);">+ with</span><br><span style="color: hsl(120, 100%, 40%);">+ Pre => Port_Cfg.Port in Digital_Port;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- procedure Post_On (Port_Cfg : Port_Config);</span><br><span style="color: hsl(120, 100%, 40%);">+ procedure Post_On (Port_Cfg : Port_Config)</span><br><span style="color: hsl(120, 100%, 40%);">+ with</span><br><span style="color: hsl(120, 100%, 40%);">+ Pre => Port_Cfg.Port in Digital_Port;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> procedure Off (Port : Digital_Port);</span><br><span> </span><br><span>diff --git a/common/haswell_shared/hw-gfx-gma-connectors.adb b/common/haswell_shared/hw-gfx-gma-connectors.adb</span><br><span>index 0d0ed71..0aed750 100644</span><br><span>--- a/common/haswell_shared/hw-gfx-gma-connectors.adb</span><br><span>+++ b/common/haswell_shared/hw-gfx-gma-connectors.adb</span><br><span>@@ -41,8 +41,11 @@</span><br><span> is</span><br><span> begin</span><br><span> pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- DDI.Pre_On (Port_Cfg, PLL_Hint, Success);</span><br><span style="color: hsl(120, 100%, 40%);">+ if Port_Cfg.Port in Digital_Port then</span><br><span style="color: hsl(120, 100%, 40%);">+ DDI.Pre_On (Port_Cfg, PLL_Hint, Success);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ success := False; -- Should not happen</span><br><span style="color: hsl(120, 100%, 40%);">+ end if;</span><br><span> end Pre_On;</span><br><span> </span><br><span> procedure Post_On</span><br><span>@@ -53,10 +56,12 @@</span><br><span> begin</span><br><span> pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DDI.Post_On (Port_Cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if Port_Cfg.Port in Digital_Port then</span><br><span style="color: hsl(120, 100%, 40%);">+ DDI.Post_On (Port_Cfg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if Port_Cfg.Port = DIGI_A then</span><br><span style="color: hsl(0, 100%, 40%);">- Panel.Backlight_On;</span><br><span style="color: hsl(120, 100%, 40%);">+ if Port_Cfg.Port = DIGI_A then</span><br><span style="color: hsl(120, 100%, 40%);">+ Panel.Backlight_On;</span><br><span style="color: hsl(120, 100%, 40%);">+ end if;</span><br><span> end if;</span><br><span> </span><br><span> Success := True;</span><br><span>@@ -79,8 +84,9 @@</span><br><span> is</span><br><span> begin</span><br><span> pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- DDI.Off (Port_Cfg.Port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if Port_Cfg.Port in Digital_Port then</span><br><span style="color: hsl(120, 100%, 40%);">+ DDI.Off (Port_Cfg.Port);</span><br><span style="color: hsl(120, 100%, 40%);">+ end if;</span><br><span> end Post_Off;</span><br><span> </span><br><span> ----------------------------------------------------------------------------</span><br><span>diff --git a/common/hw-gfx-gma-connector_info.adb b/common/hw-gfx-gma-connector_info.adb</span><br><span>index 798e61c..e8357be 100644</span><br><span>--- a/common/hw-gfx-gma-connector_info.adb</span><br><span>+++ b/common/hw-gfx-gma-connector_info.adb</span><br><span>@@ -87,7 +87,8 @@</span><br><span> begin</span><br><span> return</span><br><span> (if Port_Cfg.Port = DIGI_A or</span><br><span style="color: hsl(0, 100%, 40%);">- (Port_Cfg.Is_FDI and Port_Cfg.PCH_Port = PCH_LVDS)</span><br><span style="color: hsl(120, 100%, 40%);">+ (Port_Cfg.Is_FDI and Port_Cfg.PCH_Port = PCH_LVDS) or</span><br><span style="color: hsl(120, 100%, 40%);">+ Port_Cfg.Port = LVDS</span><br><span> then 6</span><br><span> else 8);</span><br><span> end Default_BPC;</span><br><span>diff --git a/common/hw-gfx-gma.ads b/common/hw-gfx-gma.ads</span><br><span>index 50a76a0..fadf437 100644</span><br><span>--- a/common/hw-gfx-gma.ads</span><br><span>+++ b/common/hw-gfx-gma.ads</span><br><span>@@ -126,9 +126,11 @@</span><br><span> subtype Active_Port_Type is Port_Type</span><br><span> range Port_Type'Succ (Disabled) .. Port_Type'Last;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- type GPU_Port is (DIGI_A, DIGI_B, DIGI_C, DIGI_D, DIGI_E);</span><br><span style="color: hsl(120, 100%, 40%);">+ type GPU_Port is (DIGI_A, DIGI_B, DIGI_C, DIGI_D, DIGI_E, LVDS, VGA);</span><br><span> </span><br><span> subtype Digital_Port is GPU_Port range DIGI_A .. DIGI_E;</span><br><span style="color: hsl(120, 100%, 40%);">+ subtype GMCH_DP_Port is GPU_Port range DIGI_B .. DIGI_D;</span><br><span style="color: hsl(120, 100%, 40%);">+ subtype GMCH_HDMI_Port is GPU_Port range DIGI_B .. DIGI_C;</span><br><span> </span><br><span> type PCH_Port is</span><br><span> (PCH_DAC, PCH_LVDS,</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25407">change 25407</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/25407"/><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: I9120d084637d36a7e2276fcf3f630b3f7ed32509 </div>
<div style="display:none"> Gerrit-Change-Number: 25407 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>