<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22222">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[WIP] libgfxinit: Enable G45 support (for GM45/X4X)<br><br>Change-Id: Ia637d32ffaa5d280320955d34141eddc8b7df981<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M 3rdparty/libgfxinit<br>M src/drivers/intel/gma/Kconfig<br>M src/northbridge/intel/gm45/gma.c<br>M src/northbridge/intel/x4x/gma.c<br>4 files changed, 17 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/22222/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit<br>index 3a0e2a0..472bb18 160000<br>--- a/3rdparty/libgfxinit<br>+++ b/3rdparty/libgfxinit<br>@@ -1 +1 @@<br>-Subproject commit 3a0e2a08f5489f3bb5c6e9f97b903e6e10c31a6c<br>+Subproject commit 472bb181e7476ff76419e9a196bed09fe0521b61<br>diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig<br>index a4b8a4a..7741e3f 100644<br>--- a/src/drivers/intel/gma/Kconfig<br>+++ b/src/drivers/intel/gma/Kconfig<br>@@ -58,9 +58,10 @@<br> <br> config GFX_GMA<br>  def_bool y<br>-   depends on NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \<br>-                 || NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL \<br>-                || SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE<br>+       depends on NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X \<br>+         || NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \<br>+              || NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL \<br>+                || SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE<br>   depends on MAINBOARD_HAS_LIBGFXINIT<br> <br> if GFX_GMA<br>@@ -73,6 +74,7 @@<br>        default "Ivybridge" if NORTHBRIDGE_INTEL_IVYBRIDGE<br>  default "Sandybridge" if NORTHBRIDGE_INTEL_SANDYBRIDGE<br>      default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM<br>+    default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X<br> <br> config GFX_GMA_CPU_VARIANT<br>    string<br>@@ -86,6 +88,7 @@<br> <br> config GFX_GMA_INTERNAL_IS_LVDS<br>        bool<br>+ default y if NORTHBRIDGE_INTEL_GM45<br>   default n<br> <br> config GFX_GMA_INTERNAL_PORT<br>diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c<br>index bdad49b..384f3c3 100644<br>--- a/src/northbridge/intel/gm45/gma.c<br>+++ b/src/northbridge/intel/gm45/gma.c<br>@@ -37,6 +37,7 @@<br> #include <drivers/intel/gma/opregion.h><br> #include <pc80/vga.h><br> #include <pc80/vga_io.h><br>+#include <drivers/intel/gma/libgfxinit.h><br> <br> #define BASE_FREQUENCY 96000<br> <br>@@ -772,8 +773,12 @@<br>   /* Post VBIOS init */<br>         gma_pm_init_post_vbios(dev, edid_lvds.ascii_string);<br> <br>-      if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT))<br>+ if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT)) {<br>                gma_ngi(dev, &edid_lvds);<br>+        } else if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {<br>+            int lightup_ok;<br>+              gma_gfxinit(&lightup_ok);<br>+        }<br> <br>  intel_gma_restore_opregion();<br> }<br>diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c<br>index cf3804d..70352a9 100644<br>--- a/src/northbridge/intel/x4x/gma.c<br>+++ b/src/northbridge/intel/x4x/gma.c<br>@@ -35,6 +35,7 @@<br> #include <drivers/intel/gma/edid.h><br> #include <drivers/intel/gma/i915.h><br> #include <drivers/intel/gma/opregion.h><br>+#include <drivers/intel/gma/libgfxinit.h><br> #include <pc80/vga.h><br> #include <pc80/vga_io.h><br> <br>@@ -413,6 +414,9 @@<br>                    return;<br>               }<br>             native_init(dev);<br>+    } else if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {<br>+            int lightup_ok;<br>+              gma_gfxinit(&lightup_ok);<br>         } else {<br>              pci_dev_init(dev);<br>    }<br></pre><p>To view, visit <a href="https://review.coreboot.org/22222">change 22222</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22222"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia637d32ffaa5d280320955d34141eddc8b7df981 </div>
<div style="display:none"> Gerrit-Change-Number: 22222 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>