commit f361ec81e075b3ece15fcb910ec4c96758ce33c2
author Nico Huber <nico.h@gmx.de> Sat Jun 02 18:01:45 2018 +0200
committer Nico Huber <nico.h@gmx.de> Sun Jun 03 20:37:04 2018 +0000
tree f6b0b643a65dc06c822b41fe0cb34e796e02d1fe
parent 958c5640456afc695e4b05a9a23df3ada14ebdd2

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@gmx.de>
Reviewed-on: https://review.coreboot.org/26768
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

common/hw-gfx-gma.adb

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;