UPSTREAM: 3rdparty/libgfxinit: Update submodule pointer

Some renamings force us to update our code:

  * Scan_Ports() moved into a new package Display_Probing.

  * Ports Digital[123] are called HDMI[123] now (finally!).

  * `Configs_Type` became `Pipe_Configs`, `Config_Index` `Pipe_Index`.

Other noteworthy changes in libgfxinit:

  * libgfxinit now knows about ports that share pins (e.g. HDMI1 and
    DP1) and refuses to enable any of them if both are connected
    (which is physically possible on certain ThinkPad docks).

  * Major refactoring of the high-level GMA code.

BUG=none
BRANCH=none
TEST=none

Change-Id: I54b958e7fc141fdb112b0594b159e08d2981aef0
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 989aae9f61
Original-Change-Id: I0ac376c6a3da997fa4a23054198819ca664b8bf0
Original-Signed-off-by: Nico Huber <nico.h@gmx.de>
Original-Reviewed-on: https://review.coreboot.org/18770
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Original-Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://chromium-review.googlesource.com/533039
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
This commit is contained in:
Nico Huber 2017-03-08 23:03:01 +01:00 committed by chrome-bot
commit 8ea56df8c6
6 changed files with 25 additions and 13 deletions

View file

@ -1,9 +1,11 @@
with HW.GFX;
with HW.GFX.Framebuffer_Filler;
with HW.GFX.GMA;
with HW.GFX.GMA.Display_Probing;
use HW.GFX;
use HW.GFX.GMA;
use HW.GFX.GMA.Display_Probing;
with GMA.Mainboard;
@ -55,7 +57,7 @@ is
use type pos32;
ports : Port_List;
configs : Configs_Type;
configs : Pipe_Configs;
success : boolean;
@ -70,10 +72,10 @@ is
if success then
ports := Mainboard.ports;
HW.GFX.GMA.Scan_Ports (configs, ports);
HW.GFX.GMA.Display_Probing.Scan_Ports (configs, ports);
if configs (Primary).Port /= Disabled then
for i in Config_Index loop
for i in Pipe_Index loop
exit when configs (i).Port = Disabled;
min_h := pos16'min (min_h, configs (i).Mode.H_Visible);
@ -86,7 +88,7 @@ is
BPC => 8,
Stride => ((Width_Type (min_h) + 63) / 64) * 64,
Offset => 0);
for i in Config_Index loop
for i in Pipe_Index loop
exit when configs (i).Port = Disabled;
configs (i).Framebuffer := fb;

View file

@ -1,8 +1,10 @@
with HW.GFX;
with HW.GFX.GMA;
with HW.GFX.GMA.Display_Probing;
use HW.GFX;
use HW.GFX.GMA;
use HW.GFX.GMA.Display_Probing;
with GMA.Mainboard;
@ -30,7 +32,7 @@ is
lightup_ok : out Interfaces.C.int)
is
ports : Port_List;
configs : Configs_Type;
configs : Pipe_Configs;
success : boolean;
@ -48,7 +50,7 @@ is
if success then
ports := Mainboard.ports;
HW.GFX.GMA.Scan_Ports
HW.GFX.GMA.Display_Probing.Scan_Ports
(Configs => configs,
Ports => ports,
Max_Pipe => Primary);

View file

@ -13,13 +13,15 @@
--
with HW.GFX.GMA;
with HW.GFX.GMA.Display_Probing;
use HW.GFX.GMA;
use HW.GFX.GMA.Display_Probing;
private package GMA.Mainboard is
ports : constant Port_List :=
(Digital1,
(HDMI1,
Internal,
others => Disabled);

View file

@ -1,6 +1,8 @@
with HW.GFX.GMA;
with HW.GFX.GMA.Display_Probing;
use HW.GFX.GMA;
use HW.GFX.GMA.Display_Probing;
private package GMA.Mainboard is
@ -11,9 +13,9 @@ private package GMA.Mainboard is
ports : constant Port_List :=
(DP2,
DP3,
Digital1,
Digital2,
Digital3,
HDMI1,
HDMI2,
HDMI3,
Analog,
Internal,
others => Disabled);

View file

@ -1,9 +1,11 @@
with HW.GFX.GMA;
with HW.GFX.GMA.Display_Probing;
use HW.GFX.GMA;
use HW.GFX.GMA.Display_Probing;
private package GMA.Mainboard is
ports : constant Port_List := (Internal, Digital3, others => Disabled);
ports : constant Port_List := (Internal, HDMI3, others => Disabled);
end GMA.Mainboard;

View file

@ -1,6 +1,8 @@
with HW.GFX.GMA;
with HW.GFX.GMA.Display_Probing;
use HW.GFX.GMA;
use HW.GFX.GMA.Display_Probing;
private package GMA.Mainboard is
@ -11,8 +13,8 @@ private package GMA.Mainboard is
ports : constant Port_List :=
(DP2,
DP3,
Digital2,
Digital3,
HDMI2,
HDMI3,
Analog,
Internal,
others => Disabled);