Nico Huber has uploaded this change for review. ( https://review.coreboot.org/27048
Change subject: gma config: Introduce Has_Tertiary_Pipe ......................................................................
gma config: Introduce Has_Tertiary_Pipe
And use it instead of `Supported_Pipe`.
Change-Id: Id3c4bdaf0d6b6c6126692b00cbabaf7d3f85b4bf Signed-off-by: Nico Huber nico.h@gmx.de --- M common/hw-gfx-gma-config.ads.template M common/hw-gfx-gma-config_helpers.adb 2 files changed, 3 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/48/27048/1
diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template index f498921..20ef5c0 100644 --- a/common/hw-gfx-gma-config.ads.template +++ b/common/hw-gfx-gma-config.ads.template @@ -44,6 +44,7 @@ Has_Presence_Straps : constant Boolean := CPU /= Broxton;
----- CPU pipe: -------- + Has_Tertiary_Pipe : constant Boolean := CPU >= Ivybridge; Disable_Trickle_Feed : constant Boolean := not (CPU in Haswell .. Broadwell); Pipe_Enabled_Workaround : constant Boolean := CPU = Broadwell; @@ -134,15 +135,7 @@ ----------------------------------------------------------------------------
Max_Pipe : constant Pipe_Index := - (if CPU <= Sandybridge - then Secondary - else Tertiary); - - type Supported_Pipe_Array is array (Pipe_Index) of Boolean; - Supported_Pipe : constant Supported_Pipe_Array := - (Primary => Primary <= Max_Pipe, - Secondary => Secondary <= Max_Pipe, - Tertiary => Tertiary <= Max_Pipe); + (if Has_Tertiary_Pipe then Tertiary else Secondary);
Valid_Port : array (Port_Type) of Boolean := (others => False) with diff --git a/common/hw-gfx-gma-config_helpers.adb b/common/hw-gfx-gma-config_helpers.adb index b7f4833..57163a6 100644 --- a/common/hw-gfx-gma-config_helpers.adb +++ b/common/hw-gfx-gma-config_helpers.adb @@ -131,7 +131,7 @@ is begin Success := - Config.Supported_Pipe (Pipe) and then + (Config.Has_Tertiary_Pipe or Pipe <= Secondary) and then Config.Valid_Port (Port) and then Port /= Disabled; -- Valid_Port should already cover this, but the -- array is writeable, so it's hard to prove this.