[coreboot-gerrit] Patch set updated for coreboot: 3rdparty/libgfxinit: Update submodule pointer
Nico Huber (nico.h@gmx.de)
gerrit at coreboot.org
Sun Mar 12 14:44:45 CET 2017
Nico Huber (nico.h at gmx.de) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18770
-gerrit
commit ab371d4b7ff0783c446b9acc13d52deab6b39731
Author: Nico Huber <nico.h at gmx.de>
Date: Wed Mar 8 23:03:01 2017 +0100
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 at gmx.de>
---
3rdparty/libgfxinit | 2 +-
src/drivers/intel/gma/hires_fb/gma.adb | 10 ++++++----
src/drivers/intel/gma/text_fb/gma.adb | 6 ++++--
src/mainboard/google/slippy/gma-mainboard.ads | 4 +++-
src/mainboard/kontron/ktqm77/gma-mainboard.ads | 8 +++++---
src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads | 4 +++-
src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads | 6 ++++--
7 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit
index 88a7f17..31a5217 160000
--- a/3rdparty/libgfxinit
+++ b/3rdparty/libgfxinit
@@ -1 +1 @@
-Subproject commit 88a7f17b7d7a4f8a4d25ef6b87c71236b0862f5d
+Subproject commit 31a5217d39f95b51dc1fbe452f0e169507ca95d7
diff --git a/src/drivers/intel/gma/hires_fb/gma.adb b/src/drivers/intel/gma/hires_fb/gma.adb
index 87e0900..0ee4a73 100644
--- a/src/drivers/intel/gma/hires_fb/gma.adb
+++ b/src/drivers/intel/gma/hires_fb/gma.adb
@@ -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;
diff --git a/src/drivers/intel/gma/text_fb/gma.adb b/src/drivers/intel/gma/text_fb/gma.adb
index bbb6d74..5df203b 100644
--- a/src/drivers/intel/gma/text_fb/gma.adb
+++ b/src/drivers/intel/gma/text_fb/gma.adb
@@ -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);
diff --git a/src/mainboard/google/slippy/gma-mainboard.ads b/src/mainboard/google/slippy/gma-mainboard.ads
index 1fc3906..cd5e2f5 100644
--- a/src/mainboard/google/slippy/gma-mainboard.ads
+++ b/src/mainboard/google/slippy/gma-mainboard.ads
@@ -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);
diff --git a/src/mainboard/kontron/ktqm77/gma-mainboard.ads b/src/mainboard/kontron/ktqm77/gma-mainboard.ads
index cf86617..bd2d32f 100644
--- a/src/mainboard/kontron/ktqm77/gma-mainboard.ads
+++ b/src/mainboard/kontron/ktqm77/gma-mainboard.ads
@@ -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);
diff --git a/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads b/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads
index e16846d..6357b6e 100644
--- a/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads
+++ b/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads
@@ -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;
diff --git a/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads b/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads
index 52b81fa..51c5a2b 100644
--- a/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads
+++ b/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads
@@ -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);
More information about the coreboot-gerrit
mailing list