<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23163">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gma config_helpers: Pass the modeline only to Validate_Config()<br><br>Validate_Config() had the full `Port_Config` as parameter, though we<br>only accessed the modeline. Make that explicit so we can also call it<br>when we don't have the full config available.<br><br>Change-Id: Ia4620d1ffa1a3cd098d721d84f2453f2dc19da2a<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M common/hw-gfx-gma-config_helpers.adb<br>M common/hw-gfx-gma-config_helpers.ads<br>M common/hw-gfx-gma.adb<br>3 files changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/63/23163/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/common/hw-gfx-gma-config_helpers.adb b/common/hw-gfx-gma-config_helpers.adb</span><br><span>index f2b4ef6..5e5be5d 100644</span><br><span>--- a/common/hw-gfx-gma-config_helpers.adb</span><br><span>+++ b/common/hw-gfx-gma-config_helpers.adb</span><br><span>@@ -181,9 +181,9 @@</span><br><span> -- Validates that a given configuration should work with</span><br><span> -- a given framebuffer.</span><br><span> function Validate_Config</span><br><span style="color: hsl(0, 100%, 40%);">- (FB : Framebuffer_Type;</span><br><span style="color: hsl(0, 100%, 40%);">- Port_Cfg : Port_Config;</span><br><span style="color: hsl(0, 100%, 40%);">- Pipe : Pipe_Index)</span><br><span style="color: hsl(120, 100%, 40%);">+ (FB : Framebuffer_Type;</span><br><span style="color: hsl(120, 100%, 40%);">+ Mode : Mode_Type;</span><br><span style="color: hsl(120, 100%, 40%);">+ Pipe : Pipe_Index)</span><br><span> return Boolean</span><br><span> is</span><br><span> begin</span><br><span>@@ -197,11 +197,11 @@</span><br><span> -- Plane_Control)</span><br><span> -- 90 degree rotations are only supported with Y-tiling</span><br><span> return</span><br><span style="color: hsl(0, 100%, 40%);">- ((Rotated_Width (FB) = Port_Cfg.Mode.H_Visible and</span><br><span style="color: hsl(0, 100%, 40%);">- Rotated_Height (FB) = Port_Cfg.Mode.V_Visible) or</span><br><span style="color: hsl(120, 100%, 40%);">+ ((Rotated_Width (FB) = Mode.H_Visible and</span><br><span style="color: hsl(120, 100%, 40%);">+ Rotated_Height (FB) = Mode.V_Visible) or</span><br><span> (Rotated_Width (FB) <= Config.Maximum_Scalable_Width (Pipe) and</span><br><span style="color: hsl(0, 100%, 40%);">- Rotated_Width (FB) <= Port_Cfg.Mode.H_Visible and</span><br><span style="color: hsl(0, 100%, 40%);">- Rotated_Height (FB) <= Port_Cfg.Mode.V_Visible)) and</span><br><span style="color: hsl(120, 100%, 40%);">+ Rotated_Width (FB) <= Mode.H_Visible and</span><br><span style="color: hsl(120, 100%, 40%);">+ Rotated_Height (FB) <= Mode.V_Visible)) and</span><br><span> (FB.Offset /= VGA_PLANE_FRAMEBUFFER_OFFSET or Pipe = Primary) and</span><br><span> (FB.Offset = VGA_PLANE_FRAMEBUFFER_OFFSET or</span><br><span> (FB.BPC = 8 and Valid_Stride (FB) and</span><br><span>diff --git a/common/hw-gfx-gma-config_helpers.ads b/common/hw-gfx-gma-config_helpers.ads</span><br><span>index 1dc2390..4853634 100644</span><br><span>--- a/common/hw-gfx-gma-config_helpers.ads</span><br><span>+++ b/common/hw-gfx-gma-config_helpers.ads</span><br><span>@@ -40,15 +40,15 @@</span><br><span> use type HW.Pos32;</span><br><span> pragma Warnings (GNAT, On, """Integer_32"" is already use-visible *");</span><br><span> function Validate_Config</span><br><span style="color: hsl(0, 100%, 40%);">- (FB : Framebuffer_Type;</span><br><span style="color: hsl(0, 100%, 40%);">- Port_Cfg : Port_Config;</span><br><span style="color: hsl(0, 100%, 40%);">- Pipe : Pipe_Index)</span><br><span style="color: hsl(120, 100%, 40%);">+ (FB : Framebuffer_Type;</span><br><span style="color: hsl(120, 100%, 40%);">+ Mode : Mode_Type;</span><br><span style="color: hsl(120, 100%, 40%);">+ Pipe : Pipe_Index)</span><br><span> return Boolean</span><br><span> with</span><br><span> Post =></span><br><span> (if Validate_Config'Result then</span><br><span style="color: hsl(0, 100%, 40%);">- Rotated_Width (FB) <= Port_Cfg.Mode.H_Visible and</span><br><span style="color: hsl(0, 100%, 40%);">- Rotated_Height (FB) <= Port_Cfg.Mode.V_Visible and</span><br><span style="color: hsl(120, 100%, 40%);">+ Rotated_Width (FB) <= Mode.H_Visible and</span><br><span style="color: hsl(120, 100%, 40%);">+ Rotated_Height (FB) <= Mode.V_Visible and</span><br><span> (FB.Offset = VGA_PLANE_FRAMEBUFFER_OFFSET or</span><br><span> FB.Height + FB.Start_Y <= FB.V_Stride));</span><br><span> </span><br><span>diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb</span><br><span>index 420c1a3..ab15c84 100644</span><br><span>--- a/common/hw-gfx-gma.adb</span><br><span>+++ b/common/hw-gfx-gma.adb</span><br><span>@@ -109,7 +109,7 @@</span><br><span> </span><br><span> if Success then</span><br><span> Success := Config_Helpers.Validate_Config</span><br><span style="color: hsl(0, 100%, 40%);">- (Pipe_Cfg.Framebuffer, Port_Cfg, Pipe);</span><br><span style="color: hsl(120, 100%, 40%);">+ (Pipe_Cfg.Framebuffer, Port_Cfg.Mode, Pipe);</span><br><span> end if;</span><br><span> </span><br><span> if Success then</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23163">change 23163</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/23163"/><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: Ia4620d1ffa1a3cd098d721d84f2453f2dc19da2a </div>
<div style="display:none"> Gerrit-Change-Number: 23163 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>