gma config_helpers: Pass only the modeline to Validate_Config()

Validate_Config() had the full `Port_Config` as parameter, though we
only accessed the modeline. Make that explicit so we can also call it
when we don't have the full config available.

Change-Id: Ia4620d1ffa1a3cd098d721d84f2453f2dc19da2a
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/23163
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Nico Huber
2018-01-02 13:59:36 +01:00
parent b4b72794ba
commit cbbaade460
3 changed files with 13 additions and 13 deletions

View File

@@ -181,9 +181,9 @@ is
-- Validates that a given configuration should work with
-- a given framebuffer.
function Validate_Config
(FB : Framebuffer_Type;
Port_Cfg : Port_Config;
Pipe : Pipe_Index)
(FB : Framebuffer_Type;
Mode : Mode_Type;
Pipe : Pipe_Index)
return Boolean
is
begin
@@ -197,11 +197,11 @@ is
-- Plane_Control)
-- 90 degree rotations are only supported with Y-tiling
return
((Rotated_Width (FB) = Port_Cfg.Mode.H_Visible and
Rotated_Height (FB) = Port_Cfg.Mode.V_Visible) or
((Rotated_Width (FB) = Mode.H_Visible and
Rotated_Height (FB) = Mode.V_Visible) or
(Rotated_Width (FB) <= Config.Maximum_Scalable_Width (Pipe) and
Rotated_Width (FB) <= Port_Cfg.Mode.H_Visible and
Rotated_Height (FB) <= Port_Cfg.Mode.V_Visible)) and
Rotated_Width (FB) <= Mode.H_Visible and
Rotated_Height (FB) <= Mode.V_Visible)) and
(FB.Offset /= VGA_PLANE_FRAMEBUFFER_OFFSET or Pipe = Primary) and
(FB.Offset = VGA_PLANE_FRAMEBUFFER_OFFSET or
(FB.BPC = 8 and Valid_Stride (FB) and

View File

@@ -40,15 +40,15 @@ is
use type HW.Pos32;
pragma Warnings (GNAT, On, """Integer_32"" is already use-visible *");
function Validate_Config
(FB : Framebuffer_Type;
Port_Cfg : Port_Config;
Pipe : Pipe_Index)
(FB : Framebuffer_Type;
Mode : Mode_Type;
Pipe : Pipe_Index)
return Boolean
with
Post =>
(if Validate_Config'Result then
Rotated_Width (FB) <= Port_Cfg.Mode.H_Visible and
Rotated_Height (FB) <= Port_Cfg.Mode.V_Visible and
Rotated_Width (FB) <= Mode.H_Visible and
Rotated_Height (FB) <= Mode.V_Visible and
(FB.Offset = VGA_PLANE_FRAMEBUFFER_OFFSET or
FB.Height + FB.Start_Y <= FB.V_Stride));

View File

@@ -109,7 +109,7 @@ is
if Success then
Success := Config_Helpers.Validate_Config
(Pipe_Cfg.Framebuffer, Port_Cfg, Pipe);
(Pipe_Cfg.Framebuffer, Port_Cfg.Mode, Pipe);
end if;
if Success then