<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27065">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gma config: Group mutable state into a record<br><br>Put all state into a record, `Settings`, so it can be referenced at once<br>in other packages. This is required to add stateful variables without<br>changing the rest of the codebase.<br><br>Change-Id: Iffc7984b61e57cda7bdaf3b915a4fc51b396423a<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-display_probing.adb<br>M common/hw-gfx-gma-dp_aux_request.adb<br>M common/hw-gfx-gma.adb<br>4 files changed, 24 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/65/27065/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 5715e3b..a35c81e 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>@@ -14,7 +14,7 @@</span><br><span> </span><br><span> private package HW.GFX.GMA.Config</span><br><span> with</span><br><span style="color: hsl(0, 100%, 40%);">- Initializes => (Valid_Port, Raw_Clock)</span><br><span style="color: hsl(120, 100%, 40%);">+ Initializes => Settings</span><br><span> is</span><br><span> </span><br><span> Gen : constant Generation := <<GEN>>;</span><br><span>@@ -58,6 +58,23 @@</span><br><span> </span><br><span> ----------------------------------------------------------------------------</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ type Valid_Port_Array is array (Port_Type) of Boolean;</span><br><span style="color: hsl(120, 100%, 40%);">+ type Settings_T is record</span><br><span style="color: hsl(120, 100%, 40%);">+ Valid_Port : Valid_Port_Array;</span><br><span style="color: hsl(120, 100%, 40%);">+ Raw_Clock : Frequency_Type;</span><br><span style="color: hsl(120, 100%, 40%);">+ end record;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Settings : Settings_T :=</span><br><span style="color: hsl(120, 100%, 40%);">+ (Valid_Port => (others => False),</span><br><span style="color: hsl(120, 100%, 40%);">+ Raw_Clock => Frequency_Type'First)</span><br><span style="color: hsl(120, 100%, 40%);">+ with</span><br><span style="color: hsl(120, 100%, 40%);">+ Part_Of => GMA.Config_State;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Valid_Port : Valid_Port_Array renames Settings.Valid_Port;</span><br><span style="color: hsl(120, 100%, 40%);">+ Raw_Clock : Frequency_Type renames Settings.Raw_Clock;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ----------------------------------------------------------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> Gen_G45 : constant Boolean := Gen = G45;</span><br><span> Gen_Ironlake : constant Boolean := Gen = Ironlake;</span><br><span> Gen_Haswell : constant Boolean := Gen = Haswell;</span><br><span>@@ -186,10 +203,6 @@</span><br><span> Max_Pipe : constant Pipe_Index :=</span><br><span> (if Has_Tertiary_Pipe then Tertiary else Secondary);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- Valid_Port : array (Port_Type) of Boolean := (others => False)</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(0, 100%, 40%);">-</span><br><span> Last_Digital_Port : constant Digital_Port :=</span><br><span> (if Has_DDI_E then DIGI_E else DIGI_C);</span><br><span> </span><br><span>@@ -238,9 +251,6 @@</span><br><span> elsif Gen_Skylake then 24_000_000</span><br><span> else Frequency_Type'First);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- Raw_Clock : Frequency_Type := Default_RawClk_Freq</span><br><span style="color: hsl(0, 100%, 40%);">- with Part_Of => GMA.Config_State;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> ----------------------------------------------------------------------------</span><br><span> </span><br><span> -- Maximum source width with enabled scaler. This only accounts</span><br><span>diff --git a/common/hw-gfx-gma-display_probing.adb b/common/hw-gfx-gma-display_probing.adb</span><br><span>index 50f9322..ed3ed45 100644</span><br><span>--- a/common/hw-gfx-gma-display_probing.adb</span><br><span>+++ b/common/hw-gfx-gma-display_probing.adb</span><br><span>@@ -164,10 +164,7 @@</span><br><span> Keep_Power : in Boolean := False)</span><br><span> with</span><br><span> Refined_Global =></span><br><span style="color: hsl(0, 100%, 40%);">- (Input =></span><br><span style="color: hsl(0, 100%, 40%);">- (GMA.Cur_Configs,</span><br><span style="color: hsl(0, 100%, 40%);">- Config.Raw_Clock, Config.Valid_Port,</span><br><span style="color: hsl(0, 100%, 40%);">- Time.State),</span><br><span style="color: hsl(120, 100%, 40%);">+ (Input => (GMA.Cur_Configs, Config.Settings, Time.State),</span><br><span> In_Out => (Panel.Panel_State, Registers.Register_State),</span><br><span> Proof_In => (Init_State))</span><br><span> is</span><br><span>diff --git a/common/hw-gfx-gma-dp_aux_request.adb b/common/hw-gfx-gma-dp_aux_request.adb</span><br><span>index 75a2cca..73662bd 100644</span><br><span>--- a/common/hw-gfx-gma-dp_aux_request.adb</span><br><span>+++ b/common/hw-gfx-gma-dp_aux_request.adb</span><br><span>@@ -163,7 +163,7 @@</span><br><span> Success : out Boolean)</span><br><span> with</span><br><span> Global => (In_Out => Registers.Register_State,</span><br><span style="color: hsl(0, 100%, 40%);">- Input => (Time.State, Config.Raw_Clock)),</span><br><span style="color: hsl(120, 100%, 40%);">+ Input => (Time.State, Config.Settings)),</span><br><span> Depends =></span><br><span> ((Registers.Register_State,</span><br><span> Response,</span><br><span>@@ -171,7 +171,7 @@</span><br><span> Success)</span><br><span> =></span><br><span> (Registers.Register_State,</span><br><span style="color: hsl(0, 100%, 40%);">- Config.Raw_Clock,</span><br><span style="color: hsl(120, 100%, 40%);">+ Config.Settings,</span><br><span> Time.State,</span><br><span> Port,</span><br><span> Request,</span><br><span>diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb</span><br><span>index c1eaa51..cba75d6 100644</span><br><span>--- a/common/hw-gfx-gma.adb</span><br><span>+++ b/common/hw-gfx-gma.adb</span><br><span>@@ -44,7 +44,7 @@</span><br><span> HPD_Delay, Wait_For_HPD,</span><br><span> Linear_FB_Base),</span><br><span> Init_State => Initialized,</span><br><span style="color: hsl(0, 100%, 40%);">- Config_State => (Config.Valid_Port, Config.Raw_Clock),</span><br><span style="color: hsl(120, 100%, 40%);">+ Config_State => (Config.Settings),</span><br><span> Device_State =></span><br><span> (Dev.PCI_State, Registers.Register_State, Registers.GTT_State))</span><br><span> is</span><br><span>@@ -371,9 +371,8 @@</span><br><span> with</span><br><span> Refined_Global =></span><br><span> (In_Out =></span><br><span style="color: hsl(0, 100%, 40%);">- (Config.Valid_Port, 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%);">- Config.Raw_Clock),</span><br><span style="color: hsl(120, 100%, 40%);">+ (Config.Settings, Dev.PCI_State,</span><br><span style="color: hsl(120, 100%, 40%);">+ Registers.Register_State, Port_IO.State),</span><br><span> Input =></span><br><span> (Time.State),</span><br><span> Output =></span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27065">change 27065</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/27065"/><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: Iffc7984b61e57cda7bdaf3b915a4fc51b396423a </div>
<div style="display:none"> Gerrit-Change-Number: 27065 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>