<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20582">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/intel/gma/opregion: migrate from nb/common<br><br>Migrate opregion code from northbridge/intel/common to<br>drivers/intel/gma in preparation for consolidation with<br>soc/intel/common opregion code. Rename init_igd_opregion()<br>for clarity and disambiguation with other implementations.<br><br>Change-Id: I2d0bae98f04dbe7e896ca34e15f24d29b6aa2ed6<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/drivers/intel/gma/Kconfig<br>M src/drivers/intel/gma/Makefile.inc<br>R src/drivers/intel/gma/gma_opregion.c<br>R src/drivers/intel/gma/gma_opregion.h<br>M src/northbridge/intel/common/Kconfig<br>M src/northbridge/intel/common/Makefile.inc<br>M src/northbridge/intel/fsp_sandybridge/Kconfig<br>M src/northbridge/intel/fsp_sandybridge/gma.c<br>M src/northbridge/intel/haswell/Kconfig<br>M src/northbridge/intel/haswell/gma.c<br>M src/northbridge/intel/nehalem/Kconfig<br>M src/northbridge/intel/nehalem/gma.c<br>M src/northbridge/intel/sandybridge/Kconfig<br>M src/northbridge/intel/sandybridge/gma.c<br>14 files changed, 25 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/20582/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig<br>index 1e60a42..3e513fc 100644<br>--- a/src/drivers/intel/gma/Kconfig<br>+++ b/src/drivers/intel/gma/Kconfig<br>@@ -32,6 +32,9 @@<br> bool<br> default n<br> <br>+config INTEL_GMA_OPREGION<br>+ def_bool n<br>+<br> config INTEL_GMA_SSC_ALTERNATE_REF<br> bool<br> default n<br>diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc<br>index 50494e1..e185e63 100644<br>--- a/src/drivers/intel/gma/Makefile.inc<br>+++ b/src/drivers/intel/gma/Makefile.inc<br>@@ -20,7 +20,7 @@<br> endif<br> ramstage-$(CONFIG_INTEL_GMA_ACPI) += acpi.c<br> ramstage-$(CONFIG_INTEL_GMA_ACPI) += opregion.c<br>-<br>+ramstage-$(CONFIG_INTEL_GMA_OPREGION) += gma_opregion.c<br> <br> ifeq ($(CONFIG_MAINBOARD_USE_LIBGFXINIT),y)<br> <br>diff --git a/src/northbridge/intel/common/gma_opregion.c b/src/drivers/intel/gma/gma_opregion.c<br>similarity index 97%<br>rename from src/northbridge/intel/common/gma_opregion.c<br>rename to src/drivers/intel/gma/gma_opregion.c<br>index 43e7c16..1adcd35 100644<br>--- a/src/northbridge/intel/common/gma_opregion.c<br>+++ b/src/drivers/intel/gma/gma_opregion.c<br>@@ -19,7 +19,7 @@<br> #include <arch/acpi.h><br> #include <device/pci.h><br> #include <device/pci_ids.h><br>-#include <drivers/intel/gma/intel_bios.h><br>+#include "intel_bios.h"<br> #include "gma_opregion.h"<br> <br> static void *get_intel_vbios(void)<br>@@ -76,7 +76,7 @@<br> }<br> <br> /* Initialize IGD OpRegion, called from ACPI code and OS drivers */<br>-enum cb_err init_igd_opregion(igd_opregion_t *opregion)<br>+enum cb_err intel_gma_init_igd_opregion(igd_opregion_t *opregion)<br> {<br> enum cb_err ret;<br> <br>diff --git a/src/northbridge/intel/common/gma_opregion.h b/src/drivers/intel/gma/gma_opregion.h<br>similarity index 70%<br>rename from src/northbridge/intel/common/gma_opregion.h<br>rename to src/drivers/intel/gma/gma_opregion.h<br>index 6e6d5c2..343e38a 100644<br>--- a/src/northbridge/intel/common/gma_opregion.h<br>+++ b/src/drivers/intel/gma/gma_opregion.h<br>@@ -13,12 +13,12 @@<br> * GNU General Public License for more details.<br> */<br> <br>-#ifndef NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION_H_<br>-#define NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION_H_<br>+#ifndef INTEL_GMA_OPREGION_H_<br>+#define INTEL_GMA_OPREGION_H_<br> <br> #include <types.h><br>-#include <drivers/intel/gma/opregion.h><br>+#include "opregion.h"<br> <br>-enum cb_err init_igd_opregion(igd_opregion_t *opregion);<br>+enum cb_err intel_gma_init_igd_opregion(igd_opregion_t *opregion);<br> <br>-#endif /* NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION_H_ */<br>+#endif /* INTEL_GMA_OPREGION_H_ */<br>diff --git a/src/northbridge/intel/common/Kconfig b/src/northbridge/intel/common/Kconfig<br>index 672010e..80593d6 100644<br>--- a/src/northbridge/intel/common/Kconfig<br>+++ b/src/northbridge/intel/common/Kconfig<br>@@ -1,5 +1,2 @@<br> config NORTHBRIDGE_INTEL_COMMON_MRC_CACHE<br> def_bool n<br>-<br>-config NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION<br>- def_bool n<br>diff --git a/src/northbridge/intel/common/Makefile.inc b/src/northbridge/intel/common/Makefile.inc<br>index fe72970..73427cb 100644<br>--- a/src/northbridge/intel/common/Makefile.inc<br>+++ b/src/northbridge/intel/common/Makefile.inc<br>@@ -15,4 +15,3 @@<br> <br> romstage-$(CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE) += mrc_cache.c<br> ramstage-$(CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE) += mrc_cache.c<br>-ramstage-$(CONFIG_NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION) += gma_opregion.c<br>diff --git a/src/northbridge/intel/fsp_sandybridge/Kconfig b/src/northbridge/intel/fsp_sandybridge/Kconfig<br>index 5446ba3..2b73a1b 100644<br>--- a/src/northbridge/intel/fsp_sandybridge/Kconfig<br>+++ b/src/northbridge/intel/fsp_sandybridge/Kconfig<br>@@ -18,13 +18,13 @@<br> bool<br> select CPU_INTEL_FSP_MODEL_206AX<br> select INTEL_GMA_ACPI<br>- select NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION<br>+ select INTEL_GMA_OPREGION<br> <br> config NORTHBRIDGE_INTEL_FSP_IVYBRIDGE<br> bool<br> select CPU_INTEL_FSP_MODEL_306AX<br> select INTEL_GMA_ACPI<br>- select NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION<br>+ select INTEL_GMA_OPREGION<br> <br> if NORTHBRIDGE_INTEL_FSP_IVYBRIDGE || NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE<br> <br>diff --git a/src/northbridge/intel/fsp_sandybridge/gma.c b/src/northbridge/intel/fsp_sandybridge/gma.c<br>index a3dbb1c..cf771fb 100644<br>--- a/src/northbridge/intel/fsp_sandybridge/gma.c<br>+++ b/src/northbridge/intel/fsp_sandybridge/gma.c<br>@@ -20,7 +20,7 @@<br> #include <device/pci.h><br> #include <device/pci_ids.h><br> #include <southbridge/intel/fsp_bd82x6x/nvs.h><br>-#include <northbridge/intel/common/gma_opregion.h><br>+#include <drivers/intel/gma/gma_opregion.h><br> #include <drivers/intel/gma/intel_bios.h><br> <br> #include <cbmem.h><br>@@ -133,7 +133,7 @@<br> igd_opregion_t *opregion = (igd_opregion_t *)current;<br> global_nvs_t *gnvs;<br> <br>- if (init_igd_opregion(opregion) != CB_SUCCESS)<br>+ if (intel_gma_init_igd_opregion(opregion) != CB_SUCCESS)<br> return current;<br> <br> current += sizeof(igd_opregion_t);<br>diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig<br>index 90f8774..d6cf0d7 100644<br>--- a/src/northbridge/intel/haswell/Kconfig<br>+++ b/src/northbridge/intel/haswell/Kconfig<br>@@ -17,7 +17,7 @@<br> bool<br> select CPU_INTEL_HASWELL<br> select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE<br>- select NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION<br>+ select INTEL_GMA_OPREGION<br> select INTEL_DDI<br> select INTEL_GMA_ACPI<br> select RELOCATABLE_RAMSTAGE<br>diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c<br>index 4baea70..67d328e 100644<br>--- a/src/northbridge/intel/haswell/gma.c<br>+++ b/src/northbridge/intel/haswell/gma.c<br>@@ -24,7 +24,7 @@<br> #include <drivers/intel/gma/i915_reg.h><br> #include <drivers/intel/gma/i915.h><br> #include <cpu/intel/haswell/haswell.h><br>-#include <northbridge/intel/common/gma_opregion.h><br>+#include <drivers/intel/gma/gma_opregion.h><br> #include <southbridge/intel/lynxpoint/nvs.h><br> #include <stdlib.h><br> #include <string.h><br>@@ -534,7 +534,7 @@<br> igd_opregion_t *opregion = (igd_opregion_t *)current;<br> global_nvs_t *gnvs;<br> <br>- if (init_igd_opregion(opregion) != CB_SUCCESS)<br>+ if (intel_gma_init_igd_opregion(opregion) != CB_SUCCESS)<br> return current;<br> <br> current += sizeof(igd_opregion_t);<br>diff --git a/src/northbridge/intel/nehalem/Kconfig b/src/northbridge/intel/nehalem/Kconfig<br>index 0cfa750..ec9dfed 100644<br>--- a/src/northbridge/intel/nehalem/Kconfig<br>+++ b/src/northbridge/intel/nehalem/Kconfig<br>@@ -21,7 +21,7 @@<br> select TSC_MONOTONIC_TIMER<br> select INTEL_GMA_ACPI<br> select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE<br>- select NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION<br>+ select INTEL_GMA_OPREGION<br> select ACPI_HUGE_LOWMEM_BACKUP<br> select HAVE_LINEAR_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT<br> select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT<br>diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c<br>index 0607f34..4058b7a 100644<br>--- a/src/northbridge/intel/nehalem/gma.c<br>+++ b/src/northbridge/intel/nehalem/gma.c<br>@@ -30,7 +30,7 @@<br> #include <pc80/vga.h><br> #include <pc80/vga_io.h><br> #include <southbridge/intel/ibexpeak/nvs.h><br>-#include <northbridge/intel/common/gma_opregion.h><br>+#include <drivers/intel/gma/gma_opregion.h><br> #include <cbmem.h><br> <br> #include "chip.h"<br>@@ -1143,7 +1143,7 @@<br> igd_opregion_t *opregion = (igd_opregion_t *)current;<br> global_nvs_t *gnvs;<br> <br>- if (init_igd_opregion(opregion) != CB_SUCCESS)<br>+ if (intel_gma_init_igd_opregion(opregion) != CB_SUCCESS)<br> return current;<br> <br> current += sizeof(igd_opregion_t);<br>diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig<br>index ae5ddfc..3c86303 100644<br>--- a/src/northbridge/intel/sandybridge/Kconfig<br>+++ b/src/northbridge/intel/sandybridge/Kconfig<br>@@ -17,7 +17,7 @@<br> config NORTHBRIDGE_INTEL_SANDYBRIDGE<br> bool<br> select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE<br>- select NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION<br>+ select INTEL_GMA_OPREGION<br> select CPU_INTEL_MODEL_206AX<br> select HAVE_DEBUG_RAM_SETUP<br> select INTEL_GMA_ACPI<br>@@ -26,7 +26,7 @@<br> config NORTHBRIDGE_INTEL_IVYBRIDGE<br> bool<br> select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE<br>- select NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION<br>+ select INTEL_GMA_OPREGION<br> select CPU_INTEL_MODEL_306AX<br> select HAVE_DEBUG_RAM_SETUP<br> select INTEL_GMA_ACPI<br>diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c<br>index 6d1044c..5b276c7 100644<br>--- a/src/northbridge/intel/sandybridge/gma.c<br>+++ b/src/northbridge/intel/sandybridge/gma.c<br>@@ -25,7 +25,7 @@<br> #include <cpu/x86/msr.h><br> #include <cpu/x86/mtrr.h><br> #include <southbridge/intel/bd82x6x/nvs.h><br>-#include <northbridge/intel/common/gma_opregion.h><br>+#include <drivers/intel/gma/gma_opregion.h><br> #include <cbmem.h><br> <br> #include "chip.h"<br>@@ -696,7 +696,7 @@<br> igd_opregion_t *opregion = (igd_opregion_t *)current;<br> global_nvs_t *gnvs;<br> <br>- if (init_igd_opregion(opregion) != CB_SUCCESS)<br>+ if (intel_gma_init_igd_opregion(opregion) != CB_SUCCESS)<br> return current;<br> <br> current += sizeof(igd_opregion_t);<br></pre><p>To view, visit <a href="https://review.coreboot.org/20582">change 20582</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/20582"/><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: I2d0bae98f04dbe7e896ca34e15f24d29b6aa2ed6 </div>
<div style="display:none"> Gerrit-Change-Number: 20582 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>