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. Change-Id: I0ac376c6a3da997fa4a23054198819ca664b8bf0 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/18770 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
parent
fe41ae936a
commit
989aae9f61
|
@ -1 +1 @@
|
||||||
Subproject commit 88a7f17b7d7a4f8a4d25ef6b87c71236b0862f5d
|
Subproject commit 31a5217d39f95b51dc1fbe452f0e169507ca95d7
|
|
@ -1,9 +1,11 @@
|
||||||
with HW.GFX;
|
with HW.GFX;
|
||||||
with HW.GFX.Framebuffer_Filler;
|
with HW.GFX.Framebuffer_Filler;
|
||||||
with HW.GFX.GMA;
|
with HW.GFX.GMA;
|
||||||
|
with HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
use HW.GFX;
|
use HW.GFX;
|
||||||
use HW.GFX.GMA;
|
use HW.GFX.GMA;
|
||||||
|
use HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
with GMA.Mainboard;
|
with GMA.Mainboard;
|
||||||
|
|
||||||
|
@ -55,7 +57,7 @@ is
|
||||||
use type pos32;
|
use type pos32;
|
||||||
|
|
||||||
ports : Port_List;
|
ports : Port_List;
|
||||||
configs : Configs_Type;
|
configs : Pipe_Configs;
|
||||||
|
|
||||||
success : boolean;
|
success : boolean;
|
||||||
|
|
||||||
|
@ -70,10 +72,10 @@ is
|
||||||
|
|
||||||
if success then
|
if success then
|
||||||
ports := Mainboard.ports;
|
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
|
if configs (Primary).Port /= Disabled then
|
||||||
for i in Config_Index loop
|
for i in Pipe_Index loop
|
||||||
exit when configs (i).Port = Disabled;
|
exit when configs (i).Port = Disabled;
|
||||||
|
|
||||||
min_h := pos16'min (min_h, configs (i).Mode.H_Visible);
|
min_h := pos16'min (min_h, configs (i).Mode.H_Visible);
|
||||||
|
@ -86,7 +88,7 @@ is
|
||||||
BPC => 8,
|
BPC => 8,
|
||||||
Stride => ((Width_Type (min_h) + 63) / 64) * 64,
|
Stride => ((Width_Type (min_h) + 63) / 64) * 64,
|
||||||
Offset => 0);
|
Offset => 0);
|
||||||
for i in Config_Index loop
|
for i in Pipe_Index loop
|
||||||
exit when configs (i).Port = Disabled;
|
exit when configs (i).Port = Disabled;
|
||||||
|
|
||||||
configs (i).Framebuffer := fb;
|
configs (i).Framebuffer := fb;
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
with HW.GFX;
|
with HW.GFX;
|
||||||
with HW.GFX.GMA;
|
with HW.GFX.GMA;
|
||||||
|
with HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
use HW.GFX;
|
use HW.GFX;
|
||||||
use HW.GFX.GMA;
|
use HW.GFX.GMA;
|
||||||
|
use HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
with GMA.Mainboard;
|
with GMA.Mainboard;
|
||||||
|
|
||||||
|
@ -30,7 +32,7 @@ is
|
||||||
lightup_ok : out Interfaces.C.int)
|
lightup_ok : out Interfaces.C.int)
|
||||||
is
|
is
|
||||||
ports : Port_List;
|
ports : Port_List;
|
||||||
configs : Configs_Type;
|
configs : Pipe_Configs;
|
||||||
|
|
||||||
success : boolean;
|
success : boolean;
|
||||||
|
|
||||||
|
@ -48,7 +50,7 @@ is
|
||||||
|
|
||||||
if success then
|
if success then
|
||||||
ports := Mainboard.ports;
|
ports := Mainboard.ports;
|
||||||
HW.GFX.GMA.Scan_Ports
|
HW.GFX.GMA.Display_Probing.Scan_Ports
|
||||||
(Configs => configs,
|
(Configs => configs,
|
||||||
Ports => ports,
|
Ports => ports,
|
||||||
Max_Pipe => Primary);
|
Max_Pipe => Primary);
|
||||||
|
|
|
@ -13,13 +13,15 @@
|
||||||
--
|
--
|
||||||
|
|
||||||
with HW.GFX.GMA;
|
with HW.GFX.GMA;
|
||||||
|
with HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
use HW.GFX.GMA;
|
use HW.GFX.GMA;
|
||||||
|
use HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
private package GMA.Mainboard is
|
private package GMA.Mainboard is
|
||||||
|
|
||||||
ports : constant Port_List :=
|
ports : constant Port_List :=
|
||||||
(Digital1,
|
(HDMI1,
|
||||||
Internal,
|
Internal,
|
||||||
others => Disabled);
|
others => Disabled);
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
with HW.GFX.GMA;
|
with HW.GFX.GMA;
|
||||||
|
with HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
use HW.GFX.GMA;
|
use HW.GFX.GMA;
|
||||||
|
use HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
private package GMA.Mainboard is
|
private package GMA.Mainboard is
|
||||||
|
|
||||||
|
@ -11,9 +13,9 @@ private package GMA.Mainboard is
|
||||||
ports : constant Port_List :=
|
ports : constant Port_List :=
|
||||||
(DP2,
|
(DP2,
|
||||||
DP3,
|
DP3,
|
||||||
Digital1,
|
HDMI1,
|
||||||
Digital2,
|
HDMI2,
|
||||||
Digital3,
|
HDMI3,
|
||||||
Analog,
|
Analog,
|
||||||
Internal,
|
Internal,
|
||||||
others => Disabled);
|
others => Disabled);
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
with HW.GFX.GMA;
|
with HW.GFX.GMA;
|
||||||
|
with HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
use HW.GFX.GMA;
|
use HW.GFX.GMA;
|
||||||
|
use HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
private package GMA.Mainboard is
|
private package GMA.Mainboard is
|
||||||
|
|
||||||
ports : constant Port_List := (Internal, Digital3, others => Disabled);
|
ports : constant Port_List := (Internal, HDMI3, others => Disabled);
|
||||||
|
|
||||||
end GMA.Mainboard;
|
end GMA.Mainboard;
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
with HW.GFX.GMA;
|
with HW.GFX.GMA;
|
||||||
|
with HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
use HW.GFX.GMA;
|
use HW.GFX.GMA;
|
||||||
|
use HW.GFX.GMA.Display_Probing;
|
||||||
|
|
||||||
private package GMA.Mainboard is
|
private package GMA.Mainboard is
|
||||||
|
|
||||||
|
@ -11,8 +13,8 @@ private package GMA.Mainboard is
|
||||||
ports : constant Port_List :=
|
ports : constant Port_List :=
|
||||||
(DP2,
|
(DP2,
|
||||||
DP3,
|
DP3,
|
||||||
Digital2,
|
HDMI2,
|
||||||
Digital3,
|
HDMI3,
|
||||||
Analog,
|
Analog,
|
||||||
Internal,
|
Internal,
|
||||||
others => Disabled);
|
others => Disabled);
|
||||||
|
|
Loading…
Reference in New Issue