Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42099 )
Change subject: mb/asrock/b85m_pro4: Make VGA work on Linux ......................................................................
mb/asrock/b85m_pro4: Make VGA work on Linux
Currently, having libgfxinit try to enable VGA will result in a hang. On the Asrock B85M Pro4, DDI E (VGA) was not being enabled in coreboot, so it did not hang. However, this renders Linux's i915 driver unable to use VGA at all. In absence of monitors with digital inputs, this is bad.
To work around this problem, mark DDI E as enabled, and comment out VGA from gma-mainboard.ads for the time being. This allows one to use a VGA monitor, even if it only works after Linux drivers have taken over.
Change-Id: Idd6a9e8515a1065ad3c6ddf136896fef9f0fa732 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/asrock/b85m_pro4/devicetree.cb M src/mainboard/asrock/b85m_pro4/gma-mainboard.ads 2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/42099/1
diff --git a/src/mainboard/asrock/b85m_pro4/devicetree.cb b/src/mainboard/asrock/b85m_pro4/devicetree.cb index 5cf4cf4..eec921ec 100644 --- a/src/mainboard/asrock/b85m_pro4/devicetree.cb +++ b/src/mainboard/asrock/b85m_pro4/devicetree.cb @@ -1,5 +1,8 @@ chip northbridge/intel/haswell
+ # This mainboard has VGA + register "gpu_ddi_e_connected" = "1" + device cpu_cluster 0 on chip cpu/intel/haswell register "c1_acpower" = "1" diff --git a/src/mainboard/asrock/b85m_pro4/gma-mainboard.ads b/src/mainboard/asrock/b85m_pro4/gma-mainboard.ads index 393275b..49ca38c 100644 --- a/src/mainboard/asrock/b85m_pro4/gma-mainboard.ads +++ b/src/mainboard/asrock/b85m_pro4/gma-mainboard.ads @@ -11,7 +11,8 @@ ports : constant Port_List := (HDMI1, -- DVI-D HDMI3, -- HDMI - Analog, -- VGA + -- FIXME: Haswell VGA support in libgfxinit is broken + -- Analog, -- VGA others => Disabled);
end GMA.Mainboard;
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42099 )
Change subject: mb/asrock/b85m_pro4: Make VGA work on Linux ......................................................................
Patch Set 1: Code-Review+2
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42099 )
Change subject: mb/asrock/b85m_pro4: Make VGA work on Linux ......................................................................
Patch Set 1: Code-Review+2
Angel Pons has removed a vote from this change. ( https://review.coreboot.org/c/coreboot/+/42099 )
Change subject: mb/asrock/b85m_pro4: Make VGA work on Linux ......................................................................
Removed Verified+1 by build bot (Jenkins) no-reply@coreboot.org
Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42099 )
Change subject: mb/asrock/b85m_pro4: Make VGA work on Linux ......................................................................
mb/asrock/b85m_pro4: Make VGA work on Linux
Currently, having libgfxinit try to enable VGA will result in a hang. On the Asrock B85M Pro4, DDI E (VGA) was not being enabled in coreboot, so it did not hang. However, this renders Linux's i915 driver unable to use VGA at all. In absence of monitors with digital inputs, this is bad.
To work around this problem, mark DDI E as enabled, and comment out VGA from gma-mainboard.ads for the time being. This allows one to use a VGA monitor, even if it only works after Linux drivers have taken over.
Change-Id: Idd6a9e8515a1065ad3c6ddf136896fef9f0fa732 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/42099 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Michael Niewöhner --- M src/mainboard/asrock/b85m_pro4/devicetree.cb M src/mainboard/asrock/b85m_pro4/gma-mainboard.ads 2 files changed, 5 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Michael Niewöhner: Looks good to me, approved
diff --git a/src/mainboard/asrock/b85m_pro4/devicetree.cb b/src/mainboard/asrock/b85m_pro4/devicetree.cb index 5cf4cf4..eec921ec 100644 --- a/src/mainboard/asrock/b85m_pro4/devicetree.cb +++ b/src/mainboard/asrock/b85m_pro4/devicetree.cb @@ -1,5 +1,8 @@ chip northbridge/intel/haswell
+ # This mainboard has VGA + register "gpu_ddi_e_connected" = "1" + device cpu_cluster 0 on chip cpu/intel/haswell register "c1_acpower" = "1" diff --git a/src/mainboard/asrock/b85m_pro4/gma-mainboard.ads b/src/mainboard/asrock/b85m_pro4/gma-mainboard.ads index 393275b..49ca38c 100644 --- a/src/mainboard/asrock/b85m_pro4/gma-mainboard.ads +++ b/src/mainboard/asrock/b85m_pro4/gma-mainboard.ads @@ -11,7 +11,8 @@ ports : constant Port_List := (HDMI1, -- DVI-D HDMI3, -- HDMI - Analog, -- VGA + -- FIXME: Haswell VGA support in libgfxinit is broken + -- Analog, -- VGA others => Disabled);
end GMA.Mainboard;
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42099 )
Change subject: mb/asrock/b85m_pro4: Make VGA work on Linux ......................................................................
Patch Set 3:
Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4 Emulation targets: "QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/5180 "QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/5179 "QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/5178 "QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/5177
Please note: This test is under development and might not be accurate at all!