diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2017-07-14 13:28:42 -0500 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-08-11 16:15:14 +0000 |
| commit | ebe08e0ee3dffad30abffac04f95c7579ec11a30 (patch) | |
| tree | 04455c7c23c3ad0cfc7f6ceb60dc1a6f74b6f116 /src/northbridge/intel/haswell | |
| parent | 44d399c394f0cd5d38dffe551742badc100573d3 (diff) | |
| download | coreboot-ebe08e0ee3dffad30abffac04f95c7579ec11a30.tar.xz | |
drivers/intel/gma/opregion: migrate from nb/common
Migrate opregion code from northbridge/intel/common to
drivers/intel/gma in preparation for consolidation with
soc/intel/common opregion code. Rename init_igd_opregion()
for clarity and disambiguation with other implementations.
Change-Id: I2d0bae98f04dbe7e896ca34e15f24d29b6aa2ed6
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/20582
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Diffstat (limited to 'src/northbridge/intel/haswell')
| -rw-r--r-- | src/northbridge/intel/haswell/Kconfig | 1 | ||||
| -rw-r--r-- | src/northbridge/intel/haswell/gma.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig index 90f877499b..d5dec53041 100644 --- a/src/northbridge/intel/haswell/Kconfig +++ b/src/northbridge/intel/haswell/Kconfig @@ -17,7 +17,6 @@ config NORTHBRIDGE_INTEL_HASWELL bool select CPU_INTEL_HASWELL select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE - select NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION select INTEL_DDI select INTEL_GMA_ACPI select RELOCATABLE_RAMSTAGE diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c index 4baea7071d..a7b61e2ec9 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -24,7 +24,7 @@ #include <drivers/intel/gma/i915_reg.h> #include <drivers/intel/gma/i915.h> #include <cpu/intel/haswell/haswell.h> -#include <northbridge/intel/common/gma_opregion.h> +#include <drivers/intel/gma/opregion.h> #include <southbridge/intel/lynxpoint/nvs.h> #include <stdlib.h> #include <string.h> @@ -534,7 +534,7 @@ gma_write_acpi_tables(struct device *const dev, igd_opregion_t *opregion = (igd_opregion_t *)current; global_nvs_t *gnvs; - if (init_igd_opregion(opregion) != CB_SUCCESS) + if (intel_gma_init_igd_opregion(opregion) != CB_SUCCESS) return current; current += sizeof(igd_opregion_t); |