<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26768">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gma: Introduce Pipe_Config.Scaler_Available()<br><br>G45 provides only a single panel fitter. Therefore, we can only enable<br>a single pipe that requires scaling. Scaler_Available() tells us if a<br>panel fitter is available for a given pipe. We use the result to filter<br>invalid configurations early.<br><br>Change-Id: Ie05bfb58318e79edc8ab81598458e620ffdcb2ab<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-pipe_setup.adb<br>M common/hw-gfx-gma-pipe_setup.ads<br>M common/hw-gfx-gma.adb<br>5 files changed, 63 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/68/26768/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 128b52b..b7f4833 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>@@ -188,9 +188,10 @@</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%);">- Mode : Mode_Type;</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 style="color: hsl(120, 100%, 40%);">+ Scaler_Available : Boolean)</span><br><span> return Boolean</span><br><span> is</span><br><span> begin</span><br><span>@@ -206,7 +207,8 @@</span><br><span> return</span><br><span> ((Rotated_Width (FB) = Mode.H_Visible and</span><br><span> Rotated_Height (FB) = Mode.V_Visible) or</span><br><span style="color: hsl(0, 100%, 40%);">- (Rotated_Width (FB) <= Config.Maximum_Scalable_Width (Pipe) and</span><br><span style="color: hsl(120, 100%, 40%);">+ (Scaler_Available and</span><br><span style="color: hsl(120, 100%, 40%);">+ Rotated_Width (FB) <= Config.Maximum_Scalable_Width (Pipe) and</span><br><span> Rotated_Width (FB) <= Mode.H_Visible and</span><br><span> Rotated_Height (FB) <= Mode.V_Visible)) and</span><br><span> (FB.Offset /= VGA_PLANE_FRAMEBUFFER_OFFSET or Pipe = Primary) 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 4853634..d56be5e 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,9 +40,10 @@</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%);">- Mode : Mode_Type;</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 style="color: hsl(120, 100%, 40%);">+ Scaler_Available : Boolean)</span><br><span> return Boolean</span><br><span> with</span><br><span> Post =></span><br><span>diff --git a/common/hw-gfx-gma-pipe_setup.adb b/common/hw-gfx-gma-pipe_setup.adb</span><br><span>index 04d1296..555a014 100644</span><br><span>--- a/common/hw-gfx-gma-pipe_setup.adb</span><br><span>+++ b/common/hw-gfx-gma-pipe_setup.adb</span><br><span>@@ -530,10 +530,6 @@</span><br><span> Value => Shift_Left (Word32 (Width), 16) or Word32 (Height));</span><br><span> end Setup_Ironlake_Panel_Fitter;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- -- TODO the panel fitter can only be set for one pipe</span><br><span style="color: hsl(0, 100%, 40%);">- -- If this causes problems:</span><br><span style="color: hsl(0, 100%, 40%);">- -- Check in Enable_Output if panel fitter has already been enabled</span><br><span style="color: hsl(0, 100%, 40%);">- -- Pass this information to Validate_Config</span><br><span> procedure Setup_Gmch_Panel_Fitter</span><br><span> (Controller : in Controller_Type;</span><br><span> Mode : in HW.GFX.Mode_Type;</span><br><span>@@ -564,10 +560,21 @@</span><br><span> end if;</span><br><span> end Setup_Gmch_Panel_Fitter;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ procedure Gmch_Panel_Fitter_Pipe (Pipe : out Pipe_Index)</span><br><span style="color: hsl(120, 100%, 40%);">+ is</span><br><span style="color: hsl(120, 100%, 40%);">+ Used_For_Secondary : Boolean;</span><br><span style="color: hsl(120, 100%, 40%);">+ begin</span><br><span style="color: hsl(120, 100%, 40%);">+ Registers.Is_Set_Mask</span><br><span style="color: hsl(120, 100%, 40%);">+ (Register => Registers.GMCH_PFIT_CONTROL,</span><br><span style="color: hsl(120, 100%, 40%);">+ Mask => GMCH_PFIT_CONTROL_SELECT_PIPE_B,</span><br><span style="color: hsl(120, 100%, 40%);">+ Result => Used_For_Secondary);</span><br><span style="color: hsl(120, 100%, 40%);">+ Pipe := (if Used_For_Secondary then Secondary else Primary);</span><br><span style="color: hsl(120, 100%, 40%);">+ end;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> procedure Panel_Fitter_Off (Controller : Controller_Type)</span><br><span> is</span><br><span> use type HW.GFX.GMA.Registers.Registers_Invalid_Index;</span><br><span style="color: hsl(0, 100%, 40%);">- Used_For_Secondary : Boolean;</span><br><span style="color: hsl(120, 100%, 40%);">+ Pipe_Using_PF : Pipe_Index;</span><br><span> begin</span><br><span> -- Writes to WIN_SZ arm the PS/PF registers.</span><br><span> if Config.Has_Plane_Control then</span><br><span>@@ -580,16 +587,9 @@</span><br><span> Registers.Write (Controller.PS_WIN_SZ_2, 16#0000_0000#);</span><br><span> end if;</span><br><span> elsif Config.Has_GMCH_PFIT_CONTROL then</span><br><span style="color: hsl(0, 100%, 40%);">- Registers.Is_Set_Mask</span><br><span style="color: hsl(0, 100%, 40%);">- (Register => Registers.GMCH_PFIT_CONTROL,</span><br><span style="color: hsl(0, 100%, 40%);">- Mask => GMCH_PFIT_CONTROL_SELECT_PIPE_B,</span><br><span style="color: hsl(0, 100%, 40%);">- Result => Used_For_Secondary);</span><br><span style="color: hsl(0, 100%, 40%);">- if (Controller.Pipe = Primary and not Used_For_Secondary) or</span><br><span style="color: hsl(0, 100%, 40%);">- (Controller.Pipe = Secondary and Used_For_Secondary)</span><br><span style="color: hsl(0, 100%, 40%);">- then</span><br><span style="color: hsl(0, 100%, 40%);">- Registers.Unset_Mask</span><br><span style="color: hsl(0, 100%, 40%);">- (Register => Registers.GMCH_PFIT_CONTROL,</span><br><span style="color: hsl(0, 100%, 40%);">- Mask => PF_CTRL_ENABLE);</span><br><span style="color: hsl(120, 100%, 40%);">+ Gmch_Panel_Fitter_Pipe (Pipe_Using_PF);</span><br><span style="color: hsl(120, 100%, 40%);">+ if Pipe_Using_PF = Controller.Pipe then</span><br><span style="color: hsl(120, 100%, 40%);">+ Registers.Unset_Mask (Registers.GMCH_PFIT_CONTROL, PF_CTRL_ENABLE);</span><br><span> end if;</span><br><span> else</span><br><span> Registers.Unset_Mask (Controller.PF_CTRL, PF_CTRL_ENABLE);</span><br><span>@@ -620,6 +620,26 @@</span><br><span> end if;</span><br><span> end Setup_Scaling;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ procedure Scaler_Available (Available : out Boolean; Pipe : Pipe_Index)</span><br><span style="color: hsl(120, 100%, 40%);">+ is</span><br><span style="color: hsl(120, 100%, 40%);">+ Pipe_Using_PF : Pipe_Index := Pipe_Index'First;</span><br><span style="color: hsl(120, 100%, 40%);">+ PF_Enabled : Boolean;</span><br><span style="color: hsl(120, 100%, 40%);">+ begin</span><br><span style="color: hsl(120, 100%, 40%);">+ if Config.Has_GMCH_PFIT_CONTROL then</span><br><span style="color: hsl(120, 100%, 40%);">+ Registers.Is_Set_Mask</span><br><span style="color: hsl(120, 100%, 40%);">+ (Register => Registers.GMCH_PFIT_CONTROL,</span><br><span style="color: hsl(120, 100%, 40%);">+ Mask => PF_CTRL_ENABLE,</span><br><span style="color: hsl(120, 100%, 40%);">+ Result => PF_Enabled);</span><br><span style="color: hsl(120, 100%, 40%);">+ if PF_Enabled then</span><br><span style="color: hsl(120, 100%, 40%);">+ Gmch_Panel_Fitter_Pipe (Pipe_Using_PF);</span><br><span style="color: hsl(120, 100%, 40%);">+ end if;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Available := not PF_Enabled or Pipe_Using_PF = Pipe;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ Available := True;</span><br><span style="color: hsl(120, 100%, 40%);">+ end if;</span><br><span style="color: hsl(120, 100%, 40%);">+ end Scaler_Available;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ----------------------------------------------------------------------------</span><br><span> </span><br><span> procedure Setup_FB</span><br><span>diff --git a/common/hw-gfx-gma-pipe_setup.ads b/common/hw-gfx-gma-pipe_setup.ads</span><br><span>index a61ff00..fe877ad 100644</span><br><span>--- a/common/hw-gfx-gma-pipe_setup.ads</span><br><span>+++ b/common/hw-gfx-gma-pipe_setup.ads</span><br><span>@@ -57,6 +57,8 @@</span><br><span> FB : Framebuffer_Type;</span><br><span> Cursor : Cursor_Type);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ procedure Scaler_Available (Available : out Boolean; Pipe : Pipe_Index);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private</span><br><span> </span><br><span> subtype WM_Levels is Natural range 0 .. 7;</span><br><span>diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb</span><br><span>index 7e9a959..a5e9dbe 100644</span><br><span>--- a/common/hw-gfx-gma.adb</span><br><span>+++ b/common/hw-gfx-gma.adb</span><br><span>@@ -99,6 +99,7 @@</span><br><span> Success : out Boolean)</span><br><span> is</span><br><span> Port_Cfg : Port_Config;</span><br><span style="color: hsl(120, 100%, 40%);">+ Scaler_Available : Boolean;</span><br><span> begin</span><br><span> pragma Debug (Debug.New_Line);</span><br><span> pragma Debug (Debug.Put_Line</span><br><span>@@ -108,8 +109,9 @@</span><br><span> (Port_Cfg, Pipe, Pipe_Cfg.Port, Pipe_Cfg.Mode, Success);</span><br><span> </span><br><span> if Success then</span><br><span style="color: hsl(120, 100%, 40%);">+ Display_Controller.Scaler_Available (Scaler_Available, Pipe);</span><br><span> Success := Config_Helpers.Validate_Config</span><br><span style="color: hsl(0, 100%, 40%);">- (Pipe_Cfg.Framebuffer, Port_Cfg.Mode, Pipe);</span><br><span style="color: hsl(120, 100%, 40%);">+ (Pipe_Cfg.Framebuffer, Port_Cfg.Mode, Pipe, Scaler_Available);</span><br><span> end if;</span><br><span> </span><br><span> if Success then</span><br><span>@@ -275,6 +277,7 @@</span><br><span> for Pipe in Pipe_Index loop</span><br><span> declare</span><br><span> Success : Boolean;</span><br><span style="color: hsl(120, 100%, 40%);">+ Scaler_Available : Boolean;</span><br><span> Cur_Config : Pipe_Config renames Cur_Configs (Pipe);</span><br><span> New_Config : Pipe_Config renames Configs (Pipe);</span><br><span> begin</span><br><span>@@ -299,15 +302,19 @@</span><br><span> </span><br><span> -- update framebuffer offset only</span><br><span> elsif New_Config.Port /= Disabled and</span><br><span style="color: hsl(0, 100%, 40%);">- Cur_Config.Framebuffer /= New_Config.Framebuffer and</span><br><span style="color: hsl(0, 100%, 40%);">- Config_Helpers.Validate_Config</span><br><span style="color: hsl(0, 100%, 40%);">- (New_Config.Framebuffer, New_Config.Mode, Pipe)</span><br><span style="color: hsl(120, 100%, 40%);">+ Cur_Config.Framebuffer /= New_Config.Framebuffer</span><br><span> then</span><br><span style="color: hsl(0, 100%, 40%);">- Display_Controller.Setup_FB</span><br><span style="color: hsl(0, 100%, 40%);">- (Pipe, New_Config.Mode, New_Config.Framebuffer);</span><br><span style="color: hsl(0, 100%, 40%);">- Display_Controller.Update_Cursor</span><br><span style="color: hsl(0, 100%, 40%);">- (Pipe, New_Config.Framebuffer, New_Config.Cursor);</span><br><span style="color: hsl(0, 100%, 40%);">- Cur_Config := New_Config;</span><br><span style="color: hsl(120, 100%, 40%);">+ Display_Controller.Scaler_Available (Scaler_Available, Pipe);</span><br><span style="color: hsl(120, 100%, 40%);">+ if Config_Helpers.Validate_Config</span><br><span style="color: hsl(120, 100%, 40%);">+ (New_Config.Framebuffer, New_Config.Mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ Pipe, Scaler_Available)</span><br><span style="color: hsl(120, 100%, 40%);">+ then</span><br><span style="color: hsl(120, 100%, 40%);">+ Display_Controller.Setup_FB</span><br><span style="color: hsl(120, 100%, 40%);">+ (Pipe, New_Config.Mode, New_Config.Framebuffer);</span><br><span style="color: hsl(120, 100%, 40%);">+ Display_Controller.Update_Cursor</span><br><span style="color: hsl(120, 100%, 40%);">+ (Pipe, New_Config.Framebuffer, New_Config.Cursor);</span><br><span style="color: hsl(120, 100%, 40%);">+ Cur_Config := New_Config;</span><br><span style="color: hsl(120, 100%, 40%);">+ end if;</span><br><span> end if;</span><br><span> end;</span><br><span> end loop;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26768">change 26768</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/26768"/><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: Ie05bfb58318e79edc8ab81598458e620ffdcb2ab </div>
<div style="display:none"> Gerrit-Change-Number: 26768 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>