<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27066">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gma config: Initialize stateful configs late<br><br>Defer initialization of config variables until GMA.Initialize().<br><br>Change-Id: I9192c9a7c4d67e4af7f3e26659489f58998ae832<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M common/hw-gfx-gma-config.ads.template<br>M common/hw-gfx-gma.adb<br>M common/hw-gfx-gma.ads<br>3 files changed, 12 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/66/27066/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 a35c81e..50e7e7c 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>@@ -13,8 +13,6 @@</span><br><span> --</span><br><span> </span><br><span> private package HW.GFX.GMA.Config</span><br><span style="color: hsl(0, 100%, 40%);">-with</span><br><span style="color: hsl(0, 100%, 40%);">- Initializes => Settings</span><br><span> is</span><br><span> </span><br><span> Gen : constant Generation := <<GEN>>;</span><br><span>@@ -63,12 +61,11 @@</span><br><span> Valid_Port : Valid_Port_Array;</span><br><span> Raw_Clock : Frequency_Type;</span><br><span> end record;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- Settings : Settings_T :=</span><br><span style="color: hsl(120, 100%, 40%);">+ Initial_Settings : constant Settings_T :=</span><br><span> (Valid_Port => (others => False),</span><br><span style="color: hsl(0, 100%, 40%);">- Raw_Clock => Frequency_Type'First)</span><br><span style="color: hsl(0, 100%, 40%);">- with</span><br><span style="color: hsl(0, 100%, 40%);">- Part_Of => GMA.Config_State;</span><br><span style="color: hsl(120, 100%, 40%);">+ Raw_Clock => Frequency_Type'First);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Settings : Settings_T with Part_Of => GMA.Config_State;</span><br><span> </span><br><span> Valid_Port : Valid_Port_Array renames Settings.Valid_Port;</span><br><span> Raw_Clock : Frequency_Type renames Settings.Raw_Clock;</span><br><span>diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb</span><br><span>index cba75d6..0f94010 100644</span><br><span>--- a/common/hw-gfx-gma.adb</span><br><span>+++ b/common/hw-gfx-gma.adb</span><br><span>@@ -370,13 +370,11 @@</span><br><span> Success : out Boolean)</span><br><span> with</span><br><span> Refined_Global =></span><br><span style="color: hsl(0, 100%, 40%);">- (In_Out =></span><br><span style="color: hsl(0, 100%, 40%);">- (Config.Settings, Dev.PCI_State,</span><br><span style="color: hsl(0, 100%, 40%);">- Registers.Register_State, Port_IO.State),</span><br><span style="color: hsl(0, 100%, 40%);">- Input =></span><br><span style="color: hsl(0, 100%, 40%);">- (Time.State),</span><br><span style="color: hsl(120, 100%, 40%);">+ (Input => (Time.State),</span><br><span style="color: hsl(120, 100%, 40%);">+ In_Out => (Dev.PCI_State, Registers.Register_State, Port_IO.State),</span><br><span> Output =></span><br><span style="color: hsl(0, 100%, 40%);">- (Dev.Address_State,</span><br><span style="color: hsl(120, 100%, 40%);">+ (Config.Settings,</span><br><span style="color: hsl(120, 100%, 40%);">+ Dev.Address_State,</span><br><span> Registers.Address_State,</span><br><span> PLLs.State, Panel.Panel_State,</span><br><span> Cur_Configs, Allocated_PLLs,</span><br><span>@@ -444,6 +442,7 @@</span><br><span> Framebuffer => HW.GFX.Default_FB,</span><br><span> Cursor => Default_Cursor,</span><br><span> Mode => HW.GFX.Invalid_Mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ Config.Settings := Config.Initial_Settings;</span><br><span> PLLs.Initialize;</span><br><span> </span><br><span> Dev.Initialize (Success);</span><br><span>diff --git a/common/hw-gfx-gma.ads b/common/hw-gfx-gma.ads</span><br><span>index db7f2bf..7c40dd9 100644</span><br><span>--- a/common/hw-gfx-gma.ads</span><br><span>+++ b/common/hw-gfx-gma.ads</span><br><span>@@ -25,9 +25,7 @@</span><br><span> Init_State,</span><br><span> Config_State,</span><br><span> (Device_State with External)),</span><br><span style="color: hsl(0, 100%, 40%);">- Initializes =></span><br><span style="color: hsl(0, 100%, 40%);">- (Init_State,</span><br><span style="color: hsl(0, 100%, 40%);">- Config_State)</span><br><span style="color: hsl(120, 100%, 40%);">+ Initializes => Init_State</span><br><span> is</span><br><span> </span><br><span> GTT_Page_Size : constant := 4096;</span><br><span>@@ -101,8 +99,8 @@</span><br><span> Success : out Boolean)</span><br><span> with</span><br><span> Global =></span><br><span style="color: hsl(0, 100%, 40%);">- (In_Out => (Config_State, Device_State, Port_IO.State),</span><br><span style="color: hsl(0, 100%, 40%);">- Output => (State, Init_State),</span><br><span style="color: hsl(120, 100%, 40%);">+ (In_Out => (Device_State, Port_IO.State),</span><br><span style="color: hsl(120, 100%, 40%);">+ Output => (State, Init_State, Config_State),</span><br><span> Input => (Time.State)),</span><br><span> Post => Success = Is_Initialized;</span><br><span> function Is_Initialized return Boolean</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27066">change 27066</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/27066"/><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: I9192c9a7c4d67e4af7f3e26659489f58998ae832 </div>
<div style="display:none"> Gerrit-Change-Number: 27066 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>