<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27055">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gma registers: Draw usage of Config.Fence_Count into the code<br><br>In case `Config.Fence_Count` is not a constant, we can't use it to<br>declare `Fence_Range`. Instead, limit the range throughout the code.<br><br>Change-Id: I2ab37f4cd9e6b4d37353ae4fd11d7e5a686d166f<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M common/hw-gfx-gma-registers.adb<br>1 file changed, 8 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/55/27055/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/common/hw-gfx-gma-registers.adb b/common/hw-gfx-gma-registers.adb</span><br><span>index 94965d5..fa53ebf 100644</span><br><span>--- a/common/hw-gfx-gma-registers.adb</span><br><span>+++ b/common/hw-gfx-gma-registers.adb</span><br><span>@@ -61,7 +61,7 @@</span><br><span> </span><br><span>    ----------------------------------------------------------------------------</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   subtype Fence_Range is Registers_Range range 0 .. Config.Fence_Count - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+   subtype Fence_Range is Registers_Range range 0 .. 31;</span><br><span> </span><br><span>    FENCE_PAGE_SHIFT                    : constant := 12;</span><br><span>    FENCE_PAGE_MASK                     : constant := 16#ffff_f000#;</span><br><span>@@ -69,14 +69,15 @@</span><br><span>    FENCE_VALID                         : constant := 1 * 2 ** 0;</span><br><span> </span><br><span>    function Fence_Lower_Idx (Fence : Fence_Range) return Registers_Range is</span><br><span style="color: hsl(0, 100%, 40%);">-      (Config.Fence_Base / Register_Width + 2 * Fence);</span><br><span style="color: hsl(120, 100%, 40%);">+      (Registers_Range (Config.Fence_Base / Register_Width) + 2 * Fence);</span><br><span>    function Fence_Upper_Idx (Fence : Fence_Range) return Registers_Range is</span><br><span>       (Fence_Lower_Idx (Fence) + 1);</span><br><span> </span><br><span>    procedure Clear_Fences</span><br><span>    is</span><br><span>    begin</span><br><span style="color: hsl(0, 100%, 40%);">-      for Fence in Fence_Range loop</span><br><span style="color: hsl(120, 100%, 40%);">+      for Fence in Fence_Range range 0 .. Fence_Range (Config.Fence_Count - 1)</span><br><span style="color: hsl(120, 100%, 40%);">+      loop</span><br><span>          Regs.Write (Fence_Lower_Idx (Fence), 0);</span><br><span>       end loop;</span><br><span>    end Clear_Fences;</span><br><span>@@ -101,7 +102,8 @@</span><br><span>       pragma Debug (Debug.Put_Line (" tiles per row."));</span><br><span> </span><br><span>       Success := False;</span><br><span style="color: hsl(0, 100%, 40%);">-      for Fence in Fence_Range loop</span><br><span style="color: hsl(120, 100%, 40%);">+      for Fence in Fence_Range range 0 .. Fence_Range (Config.Fence_Count - 1)</span><br><span style="color: hsl(120, 100%, 40%);">+      loop</span><br><span>          Regs.Read (Reg32, Fence_Lower_Idx (Fence));</span><br><span>          if (Reg32 and FENCE_VALID) = 0 then</span><br><span>             Regs.Write</span><br><span>@@ -127,7 +129,8 @@</span><br><span>          Shift_Left (Word32 (Last_Page), FENCE_PAGE_SHIFT);</span><br><span>       Fence_Upper, Fence_Lower : Word32;</span><br><span>    begin</span><br><span style="color: hsl(0, 100%, 40%);">-      for Fence in Fence_Range loop</span><br><span style="color: hsl(120, 100%, 40%);">+      for Fence in Fence_Range range 0 .. Fence_Range (Config.Fence_Count - 1)</span><br><span style="color: hsl(120, 100%, 40%);">+      loop</span><br><span>          Regs.Read (Fence_Lower, Fence_Lower_Idx (Fence));</span><br><span>          Regs.Read (Fence_Upper, Fence_Upper_Idx (Fence));</span><br><span>          if (Fence_Lower and FENCE_PAGE_MASK) = Page_Lower and</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27055">change 27055</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/27055"/><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: I2ab37f4cd9e6b4d37353ae4fd11d7e5a686d166f </div>
<div style="display:none"> Gerrit-Change-Number: 27055 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>