soc/intel/gma: Implement fsp_soc_get_igd_bar() in common code

`fsp/util.h` draws incompatible UDK headers in. Hence, we have to
declare it locally again.

Change-Id: Iaa5981088eeb5c36f765d6332ae47a38a6a4c875
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40729
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

12 files changed, 11 insertions, 69 deletions

diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index a20a554be15b..517c8ca97d8f 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -54,7 +54,6 @@ ramstage-y += cpu.c
 ramstage-y += chip.c
 ramstage-y += cse.c
 ramstage-y += elog.c
-ramstage-y += graphics.c
 ramstage-y += gspi.c
 ramstage-y += heci.c
 ramstage-y += i2c.c
diff --git a/src/soc/intel/apollolake/graphics.c b/src/soc/intel/apollolake/graphics.c
deleted file mode 100644
index c8d282d8375f..000000000000
--- a/src/soc/intel/apollolake/graphics.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <fsp/util.h>
-#include <intelblocks/graphics.h>
-#include <types.h>
-
-uintptr_t fsp_soc_get_igd_bar(void)
-{
-	return graphics_get_memory_base();
-}
diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc
index e0605817aed6..96f1f97d0e74 100644
--- a/src/soc/intel/cannonlake/Makefile.inc
+++ b/src/soc/intel/cannonlake/Makefile.inc
@@ -36,7 +36,6 @@ ramstage-y += cpu.c
 ramstage-y += elog.c
 ramstage-y += finalize.c
 ramstage-y += fsp_params.c
-ramstage-y += graphics.c
 ramstage-y += gspi.c
 ramstage-y += i2c.c
 ramstage-y += lockdown.c
diff --git a/src/soc/intel/cannonlake/graphics.c b/src/soc/intel/cannonlake/graphics.c
deleted file mode 100644
index 5fbe0d53a303..000000000000
--- a/src/soc/intel/cannonlake/graphics.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <acpi/acpi.h>
-#include <fsp/util.h>
-#include <device/device.h>
-#include <drivers/intel/gma/i915_reg.h>
-#include <intelblocks/graphics.h>
-#include <types.h>
-
-uintptr_t fsp_soc_get_igd_bar(void)
-{
-	return graphics_get_memory_base();
-}
diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index e2c90600ace9..f232ee545fc4 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -12,6 +12,7 @@
 #include <drivers/intel/gma/opregion.h>
 #include <intelblocks/graphics.h>
 #include <soc/pci_devs.h>
+#include <types.h>
 
 /* SoC Overrides */
 __weak void graphics_soc_init(struct device *dev)
@@ -154,6 +155,16 @@ void graphics_gtt_rmw(unsigned long reg, uint32_t andmask, uint32_t ormask)
 	graphics_gtt_write(reg, val);
 }
 
+/*
+ * fsp_soc_get_igd_bar() is declared in <fsp/util.h>,
+ * but that draws incompatible UDK headers in.
+ */
+uintptr_t fsp_soc_get_igd_bar(void);
+uintptr_t fsp_soc_get_igd_bar(void)
+{
+	return graphics_get_memory_base();
+}
+
 static const struct device_operations graphics_ops = {
 	.read_resources		= pci_dev_read_resources,
 	.set_resources		= pci_dev_set_resources,
diff --git a/src/soc/intel/icelake/Makefile.inc b/src/soc/intel/icelake/Makefile.inc
index f30816e003fe..05f4846963cf 100644
--- a/src/soc/intel/icelake/Makefile.inc
+++ b/src/soc/intel/icelake/Makefile.inc
@@ -35,7 +35,6 @@ ramstage-y += espi.c
 ramstage-y += finalize.c
 ramstage-y += fsp_params.c
 ramstage-y += gpio.c
-ramstage-y += graphics.c
 ramstage-y += lockdown.c
 ramstage-y += p2sb.c
 ramstage-y += pmc.c
diff --git a/src/soc/intel/icelake/graphics.c b/src/soc/intel/icelake/graphics.c
deleted file mode 100644
index c8d282d8375f..000000000000
--- a/src/soc/intel/icelake/graphics.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <fsp/util.h>
-#include <intelblocks/graphics.h>
-#include <types.h>
-
-uintptr_t fsp_soc_get_igd_bar(void)
-{
-	return graphics_get_memory_base();
-}
diff --git a/src/soc/intel/jasperlake/Makefile.inc b/src/soc/intel/jasperlake/Makefile.inc
index c5ad4d2095d5..1cba2187009a 100644
--- a/src/soc/intel/jasperlake/Makefile.inc
+++ b/src/soc/intel/jasperlake/Makefile.inc
@@ -36,7 +36,6 @@ ramstage-y += espi.c
 ramstage-y += finalize.c
 ramstage-y += fsp_params.c
 ramstage-y += gpio.c
-ramstage-y += graphics.c
 ramstage-y += lockdown.c
 ramstage-y += p2sb.c
 ramstage-y += pmc.c
diff --git a/src/soc/intel/jasperlake/graphics.c b/src/soc/intel/jasperlake/graphics.c
deleted file mode 100644
index c8d282d8375f..000000000000
--- a/src/soc/intel/jasperlake/graphics.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <fsp/util.h>
-#include <intelblocks/graphics.h>
-#include <types.h>
-
-uintptr_t fsp_soc_get_igd_bar(void)
-{
-	return graphics_get_memory_base();
-}
diff --git a/src/soc/intel/skylake/graphics.c b/src/soc/intel/skylake/graphics.c
index 27cb87481c91..4ecf67a98d70 100644
--- a/src/soc/intel/skylake/graphics.c
+++ b/src/soc/intel/skylake/graphics.c
@@ -10,11 +10,6 @@
 #include <soc/ramstage.h>
 #include <types.h>
 
-uintptr_t fsp_soc_get_igd_bar(void)
-{
-	return graphics_get_memory_base();
-}
-
 void graphics_soc_init(struct device *dev)
 {
 	struct soc_intel_skylake_config *conf = config_of(dev);
diff --git a/src/soc/intel/tigerlake/Makefile.inc b/src/soc/intel/tigerlake/Makefile.inc
index 9ff767cfecee..c4f71c78b397 100644
--- a/src/soc/intel/tigerlake/Makefile.inc
+++ b/src/soc/intel/tigerlake/Makefile.inc
@@ -36,7 +36,6 @@ ramstage-y += espi.c
 ramstage-y += finalize.c
 ramstage-y += fsp_params.c
 ramstage-y += gpio.c
-ramstage-y += graphics.c
 ramstage-y += lockdown.c
 ramstage-y += p2sb.c
 ramstage-y += pmc.c
diff --git a/src/soc/intel/tigerlake/graphics.c b/src/soc/intel/tigerlake/graphics.c
deleted file mode 100644
index 11aea7221143..000000000000
--- a/src/soc/intel/tigerlake/graphics.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-/*
- * This file is created based on Intel Tiger Lake Processor SA Datasheet
- * Document number: 571131
- * Chapter number: 4
- */
-
-#include <fsp/util.h>
-#include <intelblocks/graphics.h>
-#include <types.h>
-
-uintptr_t fsp_soc_get_igd_bar(void)
-{
-	return graphics_get_memory_base();
-}