coreboot-gerrit June 2018

coreboot-gerrit@coreboot.org

1 participants
2751 discussions

Change in libgfxinit[master]: gma: Introduce Pipe_Config.Scaler_Available()
by Nico Huber (Code Review) 02 Jun '18

02 Jun '18

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

1 0

Change in libgfxinit[master]: gma: Revise scaling on G45
by Nico Huber (Code Review) 02 Jun '18

02 Jun '18

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/26767 Change subject: gma: Revise scaling on G45 ...................................................................... gma: Revise scaling on G45 The G45 panel fitter needs a hint how the resulting image will be boxed to keep aspect ratio. As we can't change the panel fitter configuration while the pipe is enabled, we always tear the whole pipe down when the configuration changes. Change-Id: Ifedc19abbadcbae61892d0051f08592637f90fd7 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M common/hw-gfx-gma-pipe_setup.adb M common/hw-gfx-gma.adb 2 files changed, 23 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/67/26767/1 diff --git a/common/hw-gfx-gma-pipe_setup.adb b/common/hw-gfx-gma-pipe_setup.adb index 7a53faa..04d1296 100644 --- a/common/hw-gfx-gma-pipe_setup.adb +++ b/common/hw-gfx-gma-pipe_setup.adb @@ -118,6 +118,11 @@ GMCH_PFIT_CONTROL_SELECT_MASK : constant := 3 * 2 ** 29; GMCH_PFIT_CONTROL_SELECT_PIPE_A : constant := 0 * 2 ** 29; GMCH_PFIT_CONTROL_SELECT_PIPE_B : constant := 1 * 2 ** 29; + GMCH_PFIT_CONTROL_SCALING_MASK : constant := 3 * 2 ** 26; + GMCH_PFIT_CONTROL_SCALING : constant array (Scaling_Aspect) of Word32 := + (Evenly => 0 * 2 ** 26, + Pillarbox => 2 * 2 ** 26, + Letterbox => 3 * 2 ** 26); VGACNTRL_REG : constant Registers.Registers_Index := (if Config.Has_GMCH_VGACNTRL then @@ -530,13 +535,19 @@ -- Check in Enable_Output if panel fitter has already been enabled -- Pass this information to Validate_Config procedure Setup_Gmch_Panel_Fitter - (Controller : in Controller_Type) + (Controller : in Controller_Type; + Mode : in HW.GFX.Mode_Type; + Framebuffer : in HW.GFX.Framebuffer_Type) is PF_Ctrl_Pipe_Sel : constant Word32 := (case Controller.Pipe is when Primary => GMCH_PFIT_CONTROL_SELECT_PIPE_A, when Secondary => GMCH_PFIT_CONTROL_SELECT_PIPE_B, when others => 0); + + PF_Ctrl_Scaling : constant Word32 := + GMCH_PFIT_CONTROL_SCALING (Scaling_Type (Framebuffer, Mode)); + In_Use : Boolean; begin Registers.Is_Set_Mask @@ -547,7 +558,7 @@ if not In_Use then Registers.Write (Register => Registers.GMCH_PFIT_CONTROL, - Value => PF_CTRL_ENABLE or PF_Ctrl_Pipe_Sel); + Value => PF_CTRL_ENABLE or PF_Ctrl_Pipe_Sel or PF_Ctrl_Scaling); else Debug.Put_Line ("GMCH Pannel fitter already in use, skipping..."); end if; @@ -600,7 +611,7 @@ if Config.Has_Plane_Control then Setup_Skylake_Pipe_Scaler (Controller, Mode, Framebuffer); elsif Config.Has_GMCH_PFIT_CONTROL then - Setup_Gmch_Panel_Fitter (Controller); + Setup_Gmch_Panel_Fitter (Controller, Mode, Framebuffer); else Setup_Ironlake_Panel_Fitter (Controller, Mode, Framebuffer); end if; diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb index f962e1c..7e9a959 100644 --- a/common/hw-gfx-gma.adb +++ b/common/hw-gfx-gma.adb @@ -237,11 +237,17 @@ is begin return - Cur_Config.Port /= New_Config.Port or else - Cur_Config.Mode /= New_Config.Mode or else + Cur_Config.Port /= New_Config.Port + or else + Cur_Config.Mode /= New_Config.Mode + or else (Config.Use_PDW_For_EDP_Scaling and then (Cur_Config.Port = Internal and - Requires_Scaling (Cur_Config) /= Requires_Scaling (New_Config))); + Requires_Scaling (Cur_Config) /= Requires_Scaling (New_Config))) + or else + (Config.Has_GMCH_PFIT_CONTROL and then + (Requires_Scaling (Cur_Config) /= Requires_Scaling (New_Config) or + Scaling_Type (Cur_Config) /= Scaling_Type (New_Config))); end Full_Update; begin Old_Configs := Cur_Configs; -- To view, visit https://review.coreboot.org/26767 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifedc19abbadcbae61892d0051f08592637f90fd7 Gerrit-Change-Number: 26767 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in libgfxinit[master]: gfx, gma: Add helper to decide scaling aspect
by Nico Huber (Code Review) 02 Jun '18

02 Jun '18

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/26766 Change subject: gfx, gma: Add helper to decide scaling aspect ...................................................................... gfx, gma: Add helper to decide scaling aspect Scaling_Type() returns the resulting scaling format, `Letterbox`, `Pillarbox`, or `Evenly` when keeping aspect ratio. Change-Id: I86fb15b03c2f4b55cb00e85b57dc7a64583557d0 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M common/Makefile.inc M common/hw-gfx-gma.ads A common/hw-gfx.adb M common/hw-gfx.ads 4 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/66/26766/1 diff --git a/common/Makefile.inc b/common/Makefile.inc index 8d6634e..eff0be0 100644 --- a/common/Makefile.inc +++ b/common/Makefile.inc @@ -41,6 +41,7 @@ gfxinit-y += hw-gfx-gma.adb gfxinit-y += hw-gfx-gma.ads gfxinit-y += hw-gfx-i2c.ads +gfxinit-y += hw-gfx.adb gfxinit-y += hw-gfx.ads gfxinit-y += hw-gfx-framebuffer_filler.adb gfxinit-y += hw-gfx-framebuffer_filler.ads diff --git a/common/hw-gfx-gma.ads b/common/hw-gfx-gma.ads index 99ae279..8a83ae3 100644 --- a/common/hw-gfx-gma.ads +++ b/common/hw-gfx-gma.ads @@ -164,6 +164,9 @@ function Requires_Scaling (Pipe_Cfg : Pipe_Config) return Boolean is (Requires_Scaling (Pipe_Cfg.Framebuffer, Pipe_Cfg.Mode)); + function Scaling_Type (Pipe_Cfg : Pipe_Config) return Scaling_Aspect is + (Scaling_Type (Pipe_Cfg.Framebuffer, Pipe_Cfg.Mode)); + ---------------------------------------------------------------------------- -- Internal representation of a single pipe's configuration diff --git a/common/hw-gfx.adb b/common/hw-gfx.adb new file mode 100644 index 0000000..7124663 --- /dev/null +++ b/common/hw-gfx.adb @@ -0,0 +1,34 @@ +-- +-- Copyright (C) 2015-2016 secunet Security Networks AG +-- Copyright (C) 2017 Nico Huber <nico.h(a)gmx.de> +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 2 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- + +package body HW.GFX is + + function Scaling_Type + (FB : Framebuffer_Type; + Mode : Mode_Type) + return Scaling_Aspect + is + H_Factor : constant Pos32 := + Pos32 (Mode.H_Visible) * Pos32 (Rotated_Height (FB)); + V_Factor : constant Pos32 := + Pos32 (Mode.V_Visible) * Pos32 (Rotated_Width (FB)); + begin + return + (if H_Factor < V_Factor then Letterbox + elsif H_Factor > V_Factor then Pillarbox + else Evenly); + end Scaling_Type; + +end HW.GFX; diff --git a/common/hw-gfx.ads b/common/hw-gfx.ads index 71182da..66aafca 100644 --- a/common/hw-gfx.ads +++ b/common/hw-gfx.ads @@ -197,4 +197,8 @@ (Rotated_Width (FB) /= Mode.H_Visible or Rotated_Height (FB) /= Mode.V_Visible); + type Scaling_Aspect is (Evenly, Letterbox, Pillarbox); + function Scaling_Type (FB : Framebuffer_Type; Mode : Mode_Type) + return Scaling_Aspect; + end HW.GFX; -- To view, visit https://review.coreboot.org/26766 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I86fb15b03c2f4b55cb00e85b57dc7a64583557d0 Gerrit-Change-Number: 26766 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in libgfxinit[master]: gfx, gma: Move Requires_Scaling() up into GFX
by Nico Huber (Code Review) 02 Jun '18

02 Jun '18

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/26765 Change subject: gfx, gma: Move Requires_Scaling() up into GFX ...................................................................... gfx, gma: Move Requires_Scaling() up into GFX Change-Id: Ie6f855b128ad6d195e5c0a6fb16a6b9a64422b7b Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M common/hw-gfx-gma.ads M common/hw-gfx.ads 2 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/65/26765/1 diff --git a/common/hw-gfx-gma.ads b/common/hw-gfx-gma.ads index 7fccc0e..99ae279 100644 --- a/common/hw-gfx-gma.ads +++ b/common/hw-gfx-gma.ads @@ -161,10 +161,6 @@ Cur_Configs : Pipe_Configs with Part_Of => State; - function Requires_Scaling (FB : Framebuffer_Type; Mode : Mode_Type) - return Boolean is - (Rotated_Width (FB) /= Mode.H_Visible or - Rotated_Height (FB) /= Mode.V_Visible); function Requires_Scaling (Pipe_Cfg : Pipe_Config) return Boolean is (Requires_Scaling (Pipe_Cfg.Framebuffer, Pipe_Cfg.Mode)); diff --git a/common/hw-gfx.ads b/common/hw-gfx.ads index 1464b97..71182da 100644 --- a/common/hw-gfx.ads +++ b/common/hw-gfx.ads @@ -192,4 +192,9 @@ function FB_Size (FB : Framebuffer_Type) return Pos32 is (Pixel_To_Bytes (FB.Stride * FB.V_Stride, FB)); + function Requires_Scaling (FB : Framebuffer_Type; Mode : Mode_Type) + return Boolean is + (Rotated_Width (FB) /= Mode.H_Visible or + Rotated_Height (FB) /= Mode.V_Visible); + end HW.GFX; -- To view, visit https://review.coreboot.org/26765 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6f855b128ad6d195e5c0a6fb16a6b9a64422b7b Gerrit-Change-Number: 26765 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in libgfxinit[master]: gfx, gma: Move inline functions into private package parts
by Nico Huber (Code Review) 02 Jun '18

02 Jun '18

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/26764 Change subject: gfx, gma: Move inline functions into private package parts ...................................................................... gfx, gma: Move inline functions into private package parts Change-Id: I3adb9776e87953997a0cd430f366956dfcb2b6f0 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M common/hw-gfx-gma.ads M common/hw-gfx.ads 2 files changed, 24 insertions(+), 22 deletions(-) git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/64/26764/1 diff --git a/common/hw-gfx-gma.ads b/common/hw-gfx-gma.ads index bbcc282..7fccc0e 100644 --- a/common/hw-gfx-gma.ads +++ b/common/hw-gfx-gma.ads @@ -134,15 +134,6 @@ Device_Address : GTT_Address_Type; Valid : Boolean); - -- For the default framebuffer setup (see below) with 90 degree rotations, - -- we expect the offset which is used for the final scanout to be above - -- `GTT_Rotation_Offset`. So we can use `Offset - GTT_Rotation_Offset` for - -- the physical memory location and aperture mapping. - function Phys_Offset (FB : Framebuffer_Type) return Word32 is - (if Rotation_90 (FB) - then FB.Offset - Word32 (GTT_Rotation_Offset) * GTT_Page_Size - else FB.Offset); - procedure Setup_Default_FB (FB : in Framebuffer_Type; Clear : in Boolean := True; @@ -156,6 +147,15 @@ private + -- For the default framebuffer setup (see below) with 90 degree rotations, + -- we expect the offset which is used for the final scanout to be above + -- `GTT_Rotation_Offset`. So we can use `Offset - GTT_Rotation_Offset` for + -- the physical memory location and aperture mapping. + function Phys_Offset (FB : Framebuffer_Type) return Word32 is + (if Rotation_90 (FB) + then FB.Offset - Word32 (GTT_Rotation_Offset) * GTT_Page_Size + else FB.Offset); + ---------------------------------------------------------------------------- -- State tracking for the currently configured pipes diff --git a/common/hw-gfx.ads b/common/hw-gfx.ads index 7403a86..1464b97 100644 --- a/common/hw-gfx.ads +++ b/common/hw-gfx.ads @@ -51,19 +51,6 @@ Offset : Word32; end record; - function Rotation_90 (FB : Framebuffer_Type) return Boolean is - (FB.Rotation = Rotated_90 or FB.Rotation = Rotated_270); - - function Rotated_Width (FB : Framebuffer_Type) return Pos16 is - (if Rotation_90 (FB) then Pos16 (FB.Height) else Pos16 (FB.Width)); - function Rotated_Height (FB : Framebuffer_Type) return Pos16 is - (if Rotation_90 (FB) then Pos16 (FB.Width) else Pos16 (FB.Height)); - - function Pixel_To_Bytes (Pixel : Pixel_Type; FB : Framebuffer_Type) - return Int32 is (Pixel * Pos32 (FB.BPC) / (8 / 4)); - function FB_Size (FB : Framebuffer_Type) return Pos32 is - (Pixel_To_Bytes (FB.Stride * FB.V_Stride, FB)); - Default_FB : constant Framebuffer_Type := Framebuffer_Type' (Width => 1, Height => 1, @@ -190,4 +177,19 @@ Invalid_Mode : constant Mode_Type := Mode_Type' (Frequency_Type'First, 1, 1, 1, 1, 1, 1, 1, 1, False, False, Auto_BPC); +private + + function Rotation_90 (FB : Framebuffer_Type) return Boolean is + (FB.Rotation = Rotated_90 or FB.Rotation = Rotated_270); + + function Rotated_Width (FB : Framebuffer_Type) return Pos16 is + (if Rotation_90 (FB) then Pos16 (FB.Height) else Pos16 (FB.Width)); + function Rotated_Height (FB : Framebuffer_Type) return Pos16 is + (if Rotation_90 (FB) then Pos16 (FB.Width) else Pos16 (FB.Height)); + + function Pixel_To_Bytes (Pixel : Pixel_Type; FB : Framebuffer_Type) + return Int32 is (Pixel * Pos32 (FB.BPC) / (8 / 4)); + function FB_Size (FB : Framebuffer_Type) return Pos32 is + (Pixel_To_Bytes (FB.Stride * FB.V_Stride, FB)); + end HW.GFX; -- To view, visit https://review.coreboot.org/26764 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3adb9776e87953997a0cd430f366956dfcb2b6f0 Gerrit-Change-Number: 26764 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in coreboot[master]: src/mainboard: Remove unneeded includes
by Elyes HAOUAS (Code Review) 02 Jun '18

02 Jun '18

Elyes HAOUAS has abandoned this change. ( https://review.coreboot.org/26733 ) Change subject: src/mainboard: Remove unneeded includes ...................................................................... Abandoned -- To view, visit https://review.coreboot.org/26733 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I3d4549ac9d5693c59d28d063255db376b4394e57 Gerrit-Change-Number: 26733 Gerrit-PatchSet: 3 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: mb/google/octopus: Fix invalid IOSSTATE settings for 1.8V pins
by build bot (Jenkins) (Code Review) 02 Jun '18

02 Jun '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/26762 ) Change subject: mb/google/octopus: Fix invalid IOSSTATE settings for 1.8V pins ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/73992/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/28104/ : SUCCESS -- To view, visit https://review.coreboot.org/26762 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6a3852548f944176a80feb32e9885b03b8af25db Gerrit-Change-Number: 26762 Gerrit-PatchSet: 1 Gerrit-Owner: Shamile Khan <shamile.khan(a)intel.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Hannah Williams <hannah.williams(a)intel.com> Gerrit-Reviewer: John Zhao <john.zhao(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 02 Jun 2018 01:36:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: mb/google/octopus: Fix invalid IOSSTATE settings for 1.8V pins
by Shamile Khan (Code Review) 02 Jun '18

02 Jun '18

Shamile Khan has uploaded this change for review. ( https://review.coreboot.org/26762 Change subject: mb/google/octopus: Fix invalid IOSSTATE settings for 1.8V pins ...................................................................... mb/google/octopus: Fix invalid IOSSTATE settings for 1.8V pins When the normal termination is None, the standby termination is none also as per Doc# 572688. So when termination is only needed in standby, use the IOSSTATE setting that drives low/high via the Tx mode instead. Also disable Bluetooth and Speaker in Standby state. BUG=b:79874891, b:79982669 BRANCH=None TEST=Compiled and flashed image on Bip. Checked that suspend_resume cycles pass. Checked that bluetooth is functional on resume. Change-Id: I6a3852548f944176a80feb32e9885b03b8af25db Signed-off-by: Shamile Khan <shamile.khan(a)intel.com> --- M src/mainboard/google/octopus/variants/baseboard/gpio.c M src/mainboard/google/octopus/variants/bip/gpio.c 2 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/26762/1 diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c index f839850..394d08d 100644 --- a/src/mainboard/google/octopus/variants/baseboard/gpio.c +++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c @@ -80,8 +80,8 @@ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_51, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_I2C0_SCL */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_52, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_I2C1_SDA */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_53, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_I2C1_SCL */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_54, 0, DEEP, NONE, HIZCRx0, ENPD), /* LPSS_I2C2_SDA */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_55, 0, DEEP, NONE, HIZCRx0, ENPU), /* LPSS_I2C2_SCL */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_54, 0, DEEP, NONE, HIZCRx0, DISPUPD), /* LPSS_I2C2_SDA -- unused */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_55, 0, DEEP, NONE, HIZCRx0, DISPUPD), /* LPSS_I2C2_SCL -- unused */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_56, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_I2C3_SDA */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_57, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_I2C2_SCL */ PAD_CFG_GPIO_HI_Z(GPIO_58, NONE, DEEP, HIZCRx0, DISPUPD), /* LPSS_I2C4_SDA - unused */ @@ -104,7 +104,7 @@ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_75, NONE, DEEP, NF1, TxDRxE, DISPUPD), /* PROCHOT_B */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_211, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* EMMC_RST_B */ PAD_CFG_GPI_APIC_IOS(GPIO_212, NONE, DEEP, LEVEL, INVERT, HIZCRx1, DISPUPD), /* Touch Panel Int */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_213, 0, DEEP, NONE, HIZCRx0, ENPD), /* EN_PP3300_TOUCHSCREEN */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_213, 0, DEEP, NONE, Tx0RxDCRx0, DISPUPD), /* EN_PP3300_TOUCHSCREEN */ PAD_CFG_GPI_APIC_IOS(GPIO_214, NONE, DEEP, LEVEL, INVERT, HIZCRx1, DISPUPD), /* P_SENSOR_INT_L */ /* NORTH COMMUNITY GPIOS */ @@ -129,9 +129,9 @@ /* Fast SPI */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_90, DN_20K, DEEP, NF1, HIZCRx1, ENPU),/* FST_SPI_CS0_B */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_91, 0, DEEP, NONE, HIZCRx0, ENPD),/* FST_SPI_CS1_B -- SPK_PA_EN_R */ - PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_92, NONE, DEEP, NF1, HIZCRx1, ENPD),/* FST_SPI_MOSI_IO0 */ - PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_93, NONE, DEEP, NF1, HIZCRx1, ENPD),/* FST_SPI_MISO_IO1 */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_91, 0, DEEP, NONE, Tx1RxDCRx1, DISPUPD),/* FST_SPI_CS1_B -- SPK_PA_EN_R */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_92, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* FST_SPI_MOSI_IO0 */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_93, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* FST_SPI_MISO_IO1 */ PAD_CFG_GPIO_HI_Z(GPIO_94, NONE, DEEP, HIZCRx0, DISPUPD),/* FST_SPI_IO2 - unused */ PAD_CFG_GPIO_HI_Z(GPIO_95, NONE, DEEP, HIZCRx0, DISPUPD),/* FST_SPI_IO3 - unused */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_96, DN_20K, DEEP, NF1, HIZCRx0, ENPD),/* FST_SPI_CLK */ @@ -148,7 +148,7 @@ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_106, UP_20K, DEEP, NF1, HIZCRx1, ENPU),/* PMU_BATLOW_B */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_107, NONE, DEEP, NF1, TxDRxE, DISPUPD),/* PMU_RESETBUTTON_B */ PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_108, NONE, DEEP, NF1),/* PMU_SUSCLK */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_109, 1, DEEP, NONE, HIZCRx1, ENPU),/* SUS_STAT_B -- BT_DISABLE_L */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_109, 1, DEEP, NONE, Tx0RxDCRx0, DISPUPD),/* SUS_STAT_B -- BT_DISABLE_L */ /* I2C5 - Audio */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_110, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* LPSS_I2C5_SDA */ diff --git a/src/mainboard/google/octopus/variants/bip/gpio.c b/src/mainboard/google/octopus/variants/bip/gpio.c index 17fc105..3d147a9 100644 --- a/src/mainboard/google/octopus/variants/bip/gpio.c +++ b/src/mainboard/google/octopus/variants/bip/gpio.c @@ -78,8 +78,8 @@ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_51, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_I2C0_SCL */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_52, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_I2C1_SDA */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_53, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_I2C1_SCL */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_54, 0, DEEP, NONE, HIZCRx0, ENPD), /* LPSS_I2C2_SDA */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_55, 0, DEEP, NONE, HIZCRx0, ENPU), /* LPSS_I2C2_SCL */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_54, 0, DEEP, NONE, HIZCRx0, DISPUPD), /* LPSS_I2C2_SDA -- unused */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_55, 0, DEEP, NONE, HIZCRx0, DISPUPD), /* LPSS_I2C2_SCL -- unused */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_56, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_I2C3_SDA */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_57, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_I2C2_SCL */ PAD_CFG_GPIO_HI_Z(GPIO_58, NONE, DEEP, HIZCRx0, DISPUPD), /* LPSS_I2C4_SDA - unused */ @@ -102,7 +102,7 @@ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_75, NONE, DEEP, NF1, TxDRxE, DISPUPD), /* PROCHOT_B */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_211, NONE, DEEP, NF1, HIZCRx1, DISPUPD), /* EMMC_RST_B */ PAD_CFG_GPI_APIC_IOS(GPIO_212, NONE, DEEP, LEVEL, INVERT, HIZCRx1, DISPUPD), /* Touch Panel Int */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_213, 0, DEEP, NONE, HIZCRx0, ENPD), /* EN_PP3300_TOUCHSCREEN */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_213, 0, DEEP, NONE, Tx0RxDCRx0, DISPUPD), /* EN_PP3300_TOUCHSCREEN */ PAD_CFG_GPI_APIC_IOS(GPIO_214, NONE, DEEP, LEVEL, INVERT, HIZCRx1, DISPUPD), /* P_SENSOR_INT_L */ /* NORTH COMMUNITY GPIOS */ @@ -127,9 +127,9 @@ /* Fast SPI */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_90, DN_20K, DEEP, NF1, HIZCRx1, ENPU),/* FST_SPI_CS0_B */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_91, 0, DEEP, NONE, HIZCRx0, ENPD),/* FST_SPI_CS1_B -- SPK_PA_EN_R */ - PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_92, NONE, DEEP, NF1, HIZCRx1, ENPD),/* FST_SPI_MOSI_IO0 */ - PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_93, NONE, DEEP, NF1, HIZCRx1, ENPD),/* FST_SPI_MISO_IO1 */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_91, 0, DEEP, NONE, Tx1RxDCRx1, DISPUPD),/* FST_SPI_CS1_B -- SPK_PA_EN_R */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_92, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* FST_SPI_MOSI_IO0 */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_93, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* FST_SPI_MISO_IO1 */ PAD_CFG_GPIO_HI_Z(GPIO_94, NONE, DEEP, HIZCRx0, DISPUPD),/* FST_SPI_IO2 - unused */ PAD_CFG_GPIO_HI_Z(GPIO_95, NONE, DEEP, HIZCRx0, DISPUPD),/* FST_SPI_IO3 - unused */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_96, DN_20K, DEEP, NF1, HIZCRx0, ENPD),/* FST_SPI_CLK */ @@ -146,7 +146,7 @@ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_106, UP_20K, DEEP, NF1, HIZCRx1, ENPU),/* PMU_BATLOW_B */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_107, NONE, DEEP, NF1, TxDRxE, DISPUPD),/* PMU_RESETBUTTON_B */ PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_108, NONE, DEEP, NF1),/* PMU_SUSCLK */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_109, 1, DEEP, NONE, HIZCRx1, ENPU),/* SUS_STAT_B -- BT_DISABLE_L */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_109, 1, DEEP, NONE, Tx0RxDCRx0, DISPUPD),/* SUS_STAT_B -- BT_DISABLE_L */ /* I2C5 - Audio */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_110, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* LPSS_I2C5_SDA */ -- To view, visit https://review.coreboot.org/26762 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6a3852548f944176a80feb32e9885b03b8af25db Gerrit-Change-Number: 26762 Gerrit-PatchSet: 1 Gerrit-Owner: Shamile Khan <shamile.khan(a)intel.com>

1 0

Change in coreboot[master]: soc/amd/stoneyridge/acpi.c: Create GPIO acpigen procedures
by build bot (Jenkins) (Code Review) 01 Jun '18

01 Jun '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/26335 ) Change subject: soc/amd/stoneyridge/acpi.c: Create GPIO acpigen procedures ...................................................................... Patch Set 6: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/73991/ : SUCCESS -- To view, visit https://review.coreboot.org/26335 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9062d889f828a3175b89e6f4a3659ebbf90eac68 Gerrit-Change-Number: 26335 Gerrit-PatchSet: 6 Gerrit-Owner: Richard Spiegel <richard.spiegel(a)silverbackltd.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Richard Spiegel <richard.spiegel(a)silverbackltd.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 01 Jun 2018 21:14:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: soc/amd/stoneyridge/acpi: Create a GPIO library
by build bot (Jenkins) (Code Review) 01 Jun '18

01 Jun '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/26334 ) Change subject: soc/amd/stoneyridge/acpi: Create a GPIO library ...................................................................... Patch Set 7: Build Successful https://qa.coreboot.org/job/coreboot-gerrit/73990/ : SUCCESS -- To view, visit https://review.coreboot.org/26334 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I21c014b7f2698dd9193dae3113b18ee2a7303bcf Gerrit-Change-Number: 26334 Gerrit-PatchSet: 7 Gerrit-Owner: Richard Spiegel <richard.spiegel(a)silverbackltd.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Richard Spiegel <richard.spiegel(a)silverbackltd.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 01 Jun 2018 21:10:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit June 2018