Change in coreboot[master]: mb/purism/librem_whl: Add libgfxinit support

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_whl: Add libgfxinit support
......................................................................

mb/purism/librem_whl: Add libgfxinit support

Only the DisplayPort output is working as of now. The HDMI 2.0 output is
provided by a Parade DP175 LSPCON, which is internally connected to DP2.
LSPCON setup in libgfxinit is missing as of now, but will be added soon.

Change-Id: I0da26fef304583eec0375eee2082a9d2ebe27292
Signed-off-by: Angel Pons 
---
M src/mainboard/purism/librem_whl/Kconfig
M src/mainboard/purism/librem_whl/Makefile.inc
A src/mainboard/purism/librem_whl/gma-mainboard.ads
3 files changed, 19 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/46627/1

diff --git a/src/mainboard/purism/librem_whl/Kconfig b/src/mainboard/purism/librem_whl/Kconfig
index bc25fb5..ea79d90 100644
--- a/src/mainboard/purism/librem_whl/Kconfig
+++ b/src/mainboard/purism/librem_whl/Kconfig
@@ -6,6 +6,7 @@
    select HAVE_ACPI_RESUME
    select HAVE_ACPI_TABLES
    select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_HAS_LIBGFXINIT
    select NO_UART_ON_SUPERIO
    select SOC_INTEL_COMMON_BLOCK_HDA
    select SOC_INTEL_COMMON_BLOCK_HDA_VERB
diff --git a/src/mainboard/purism/librem_whl/Makefile.inc b/src/mainboard/purism/librem_whl/Makefile.inc
index ba157df..0725df5 100644
--- a/src/mainboard/purism/librem_whl/Makefile.inc
+++ b/src/mainboard/purism/librem_whl/Makefile.inc
@@ -4,4 +4,6 @@
 ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
 ramstage-y += ramstage.c

+ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
diff --git a/src/mainboard/purism/librem_whl/gma-mainboard.ads b/src/mainboard/purism/librem_whl/gma-mainboard.ads
new file mode 100644
index 0000000..5494485
--- /dev/null
+++ b/src/mainboard/purism/librem_whl/gma-mainboard.ads
@@ -0,0 +1,16 @@
+-- SPDX-License-Identifier: GPL-2.0-or-later
+
+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 :=
+     (DP1,  -- DisplayPort connector
+      DP2,  -- HDMI connector through Parade DP175 LSPCON
+      others => Disabled);
+
+end GMA.Mainboard;

[Arthur Heymans (Code Review)]

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_whl: Add libgfxinit support
......................................................................

Patch Set 1: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_whl: Add libgfxinit support
......................................................................

Patch Set 1: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/46627/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/46627/1//COMMIT_MSG@11 
PS1, Line 11: setup
I assume it will rather be a workaround than a setup.

[Matt DeVillier (Code Review)]

Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_whl: Add libgfxinit support
......................................................................

Patch Set 1:

doesn't this have a dependency on currently-unmerged changes to libgfxinit?

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_whl: Add libgfxinit support
......................................................................

Patch Set 1: Code-Review-2

Blocking for now because libgfxinit in its current state causes hangs when idling. Patches are up for review, but until they are submitted, this one should wait.

[Angel Pons (Code Review)]

Hello build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth, Matt DeVillier, Arthur Heymans,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46627

to look at the new patch set (#4).

Change subject: mb/purism/librem_whl: Add libgfxinit support
......................................................................

mb/purism/librem_whl: Add libgfxinit support

Only the DisplayPort output is working as of now. The HDMI 2.0 output is
provided by a Parade DP175 LSPCON, which is internally connected to DP2.
LSPCON setup in libgfxinit is missing as of now, but will be added soon.

Change-Id: I0da26fef304583eec0375eee2082a9d2ebe27292
Signed-off-by: Angel Pons 
---
M src/mainboard/purism/librem_cnl/Kconfig
M src/mainboard/purism/librem_cnl/Makefile.inc
A src/mainboard/purism/librem_cnl/gma-mainboard.ads
3 files changed, 19 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/46627/4

[Angel Pons (Code Review)]

Angel Pons has removed a vote from this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_whl: Add libgfxinit support
......................................................................

Removed Code-Review-2 by Angel Pons

Change in coreboot[master]: mb/purism/librem_cnl: Add libgfxinit support

[Angel Pons (Code Review)]

Hello build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth, Matt DeVillier, Arthur Heymans,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46627

to look at the new patch set (#5).

Change subject: mb/purism/librem_cnl: Add libgfxinit support
......................................................................

mb/purism/librem_cnl: Add libgfxinit support

Only the DisplayPort output is working as of now. The HDMI 2.0 output is
provided by a Parade DP175 LSPCON, which is internally connected to DP2.
LSPCON setup in libgfxinit is missing as of now, but will be added soon.

Change-Id: I0da26fef304583eec0375eee2082a9d2ebe27292
Signed-off-by: Angel Pons 
---
M src/mainboard/purism/librem_cnl/Kconfig
M src/mainboard/purism/librem_cnl/Makefile.inc
A src/mainboard/purism/librem_cnl/gma-mainboard.ads
3 files changed, 19 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/46627/5

Change in coreboot[master]: mb/purism/librem_cnl: Add libgfxinit support

[Matt DeVillier (Code Review)]

Attention is currently required from: Angel Pons.
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_cnl: Add libgfxinit support
......................................................................

Patch Set 6:

(3 comments)

Commit Message:

https://review.coreboot.org/c/coreboot/+/46627/comment/baa42b48_ffec261c 
PS6, Line 9: Only the DisplayPort output is working as of now
FWIW, HDMI output works on a warm boot, but not a cold one

File src/mainboard/purism/librem_cnl/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/46627/comment/c3846e69_4c30525d 
PS6, Line 9: gma-mainboard.ads
prepend with `variants/$(VARIANT_DIR)/`

File src/mainboard/purism/librem_cnl/gma-mainboard.ads:

https://review.coreboot.org/c/coreboot/+/46627/comment/b749959b_e3bea65e 
PS6, Line 1: -- SPDX-License-Identifier: GPL-2.0-or-later
this should really go under the variant directory since other soon-to-be-added variants will have different outputs

Change in coreboot[master]: mb/purism/librem_cnl: Add libgfxinit support

[Angel Pons (Code Review)]

Attention is currently required from: Angel Pons.
Hello build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth, Matt DeVillier, Arthur Heymans,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46627

to look at the new patch set (#7).

Change subject: mb/purism/librem_cnl: Add libgfxinit support
......................................................................

mb/purism/librem_cnl: Add libgfxinit support

Only the DisplayPort output is working as of now. The HDMI 2.0 output is
provided by a Parade DP175 LSPCON, which is internally connected to DP2.
LSPCON setup in libgfxinit is missing as of now, but will be added soon.

Change-Id: I0da26fef304583eec0375eee2082a9d2ebe27292
Signed-off-by: Angel Pons 
---
M src/mainboard/purism/librem_cnl/Kconfig
M src/mainboard/purism/librem_cnl/Makefile.inc
A src/mainboard/purism/librem_cnl/variants/librem_mini/gma-mainboard.ads
3 files changed, 19 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/46627/7

Change in coreboot[master]: mb/purism/librem_cnl: Add libgfxinit support

[Angel Pons (Code Review)]

Attention is currently required from: Matt DeVillier.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_cnl: Add libgfxinit support
......................................................................

Patch Set 6:

(3 comments)

Commit Message:

https://review.coreboot.org/c/coreboot/+/46627/comment/7f9c28c9_498be873 
PS6, Line 9: Only the DisplayPort output is working as of now
> FWIW, HDMI output works on a warm boot, but not a cold one

Yeah, the LSPCON only needs to be configured once. I assume nothing needs to be done, marking as resolved.

File src/mainboard/purism/librem_cnl/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/46627/comment/d77356c1_b0fba912 
PS6, Line 9: gma-mainboard.ads
> prepend with `variants/$(VARIANT_DIR)/`

Done with ack

File src/mainboard/purism/librem_cnl/gma-mainboard.ads:

https://review.coreboot.org/c/coreboot/+/46627/comment/3a59983a_504166a0 
PS6, Line 1: -- SPDX-License-Identifier: GPL-2.0-or-later
> this should really go under the variant directory since other soon-to-be-added variants will have di […]

Done with ack

Change in coreboot[master]: mb/purism/librem_cnl: Add libgfxinit support

[Matt DeVillier (Code Review)]

Attention is currently required from: Angel Pons.
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_cnl: Add libgfxinit support
......................................................................

Patch Set 7: Code-Review+1

(1 comment)

Patchset:

PS7: 
Linux boots fine with either display output, but Windows craps out when the Intel driver loads. I'm not sure it's strictly a libgfxinit issue, but there's no problem when using VBIOS, FSP/GOP, or Tiano/GOP init, so there's some connection.

My preference would be to have the HDMI/LSPCON issue sorted before merging since that's the primary output of most users, and libgfxinit ends up being the default display init method.

Change in coreboot[master]: mb/purism/librem_mini: Add libgfxinit support

[Angel Pons (Code Review)]

Hello build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth, Matt DeVillier, Arthur Heymans,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46627

to look at the new patch set (#10).

Change subject: mb/purism/librem_mini: Add libgfxinit support
......................................................................

mb/purism/librem_mini: Add libgfxinit support

Tested on Librem Mini v1 (WHL), both DisplayPort and HDMI 2.0 work.

Change-Id: I0da26fef304583eec0375eee2082a9d2ebe27292
Signed-off-by: Angel Pons 
---
M src/mainboard/purism/librem_cnl/Kconfig
M src/mainboard/purism/librem_cnl/Kconfig.name
A src/mainboard/purism/librem_cnl/variants/librem_mini/gma-mainboard.ads
3 files changed, 17 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/46627/10

Change in coreboot[master]: mb/purism/librem_mini: Add libgfxinit support

[Angel Pons (Code Review)]

Attention is currently required from: Matt DeVillier.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_mini: Add libgfxinit support
......................................................................

Patch Set 10:

(1 comment)

Patchset:

PS7:
> Linux boots fine with either display output, but Windows craps out when the Intel driver loads. […]

I didn't test Windows, but LSPCON support is working now.

Change in coreboot[master]: mb/purism/librem_mini: Add libgfxinit support

[Arthur Heymans (Code Review)]

Attention is currently required from: Matt DeVillier, Angel Pons.
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_mini: Add libgfxinit support
......................................................................

Patch Set 10: Code-Review+2

Change in coreboot[master]: mb/purism/librem_mini: Add libgfxinit support

[Matt DeVillier (Code Review)]

Attention is currently required from: Angel Pons.
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_mini: Add libgfxinit support
......................................................................

Patch Set 10: Code-Review+2

Change in coreboot[master]: mb/purism/librem_mini: Add libgfxinit support

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46627 )

Change subject: mb/purism/librem_mini: Add libgfxinit support
......................................................................

mb/purism/librem_mini: Add libgfxinit support

Tested on Librem Mini v1 (WHL), both DisplayPort and HDMI 2.0 work.

Change-Id: I0da26fef304583eec0375eee2082a9d2ebe27292
Signed-off-by: Angel Pons 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46627
Tested-by: build bot (Jenkins) 
Reviewed-by: Arthur Heymans 
Reviewed-by: Matt DeVillier 
---
M src/mainboard/purism/librem_cnl/Kconfig
M src/mainboard/purism/librem_cnl/Kconfig.name
A src/mainboard/purism/librem_cnl/variants/librem_mini/gma-mainboard.ads
3 files changed, 17 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Matt DeVillier: Looks good to me, approved
  Arthur Heymans: Looks good to me, approved

diff --git a/src/mainboard/purism/librem_cnl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig
index eeb4d3b..591367d 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig
+++ b/src/mainboard/purism/librem_cnl/Kconfig
@@ -6,6 +6,7 @@
    select HAVE_ACPI_RESUME
    select HAVE_ACPI_TABLES
    select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_HAS_LIBGFXINIT
    select NO_UART_ON_SUPERIO
    select SOC_INTEL_COMMON_BLOCK_HDA_VERB
    select SPD_CACHE_IN_FMAP
diff --git a/src/mainboard/purism/librem_cnl/Kconfig.name b/src/mainboard/purism/librem_cnl/Kconfig.name
index e5da916..cfe8626 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig.name
+++ b/src/mainboard/purism/librem_cnl/Kconfig.name
@@ -13,7 +13,6 @@
    select BOARD_PURISM_BASEBOARD_LIBREM_CNL
    select DRIVERS_I2C_HID
    select EC_LIBREM_EC
-	select MAINBOARD_HAS_LIBGFXINIT
    select MAINBOARD_HAS_LPC_TPM
    select MAINBOARD_HAS_TPM1
    select SOC_INTEL_COMETLAKE_1
diff --git a/src/mainboard/purism/librem_cnl/variants/librem_mini/gma-mainboard.ads b/src/mainboard/purism/librem_cnl/variants/librem_mini/gma-mainboard.ads
new file mode 100644
index 0000000..5494485
--- /dev/null
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/gma-mainboard.ads
@@ -0,0 +1,16 @@
+-- SPDX-License-Identifier: GPL-2.0-or-later
+
+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 :=
+     (DP1,  -- DisplayPort connector
+      DP2,  -- HDMI connector through Parade DP175 LSPCON
+      others => Disabled);
+
+end GMA.Mainboard;