summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-01-05 20:30:16 +0100
committerPatrick Georgi <pgeorgi@google.com>2021-03-01 08:32:47 +0000
commit09f06056eb7f2f1f966cf0e8942c42edb8a066a4 (patch)
tree5376b17286e7d31f1e1fbb671f812a36490d08a3
parent13818f5c5cd55ce8bfa3c5942978a07c2d80f5eb (diff)
soc/intel: Include gfx.asl from northbridge
The iGPU is on the northbridge or system agent, not the southbridge. Change-Id: Ic63a7ad532fd1faa8e90d44bf7269040fa901757 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/49123 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Subrata Banik <subrata.banik@intel.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/soc/intel/alderlake/acpi/southbridge.asl3
-rw-r--r--src/soc/intel/apollolake/acpi/northbridge.asl3
-rw-r--r--src/soc/intel/apollolake/acpi/southbridge.asl3
-rw-r--r--src/soc/intel/cannonlake/acpi/southbridge.asl3
-rw-r--r--src/soc/intel/common/block/acpi/acpi/northbridge.asl3
-rw-r--r--src/soc/intel/elkhartlake/acpi/southbridge.asl3
-rw-r--r--src/soc/intel/icelake/acpi/southbridge.asl3
-rw-r--r--src/soc/intel/jasperlake/acpi/southbridge.asl3
-rw-r--r--src/soc/intel/skylake/acpi/pch.asl3
-rw-r--r--src/soc/intel/skylake/acpi/systemagent.asl3
-rw-r--r--src/soc/intel/tigerlake/acpi/southbridge.asl3
11 files changed, 9 insertions, 24 deletions
diff --git a/src/soc/intel/alderlake/acpi/southbridge.asl b/src/soc/intel/alderlake/acpi/southbridge.asl
index 744b7ef50a..3a53f2c9d1 100644
--- a/src/soc/intel/alderlake/acpi/southbridge.asl
+++ b/src/soc/intel/alderlake/acpi/southbridge.asl
@@ -17,9 +17,6 @@
/* GPIO controller */
#include "gpio.asl"
-/* GFX 00:02.0 */
-#include <drivers/intel/gma/acpi/gfx.asl>
-
/* ESPI 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
diff --git a/src/soc/intel/apollolake/acpi/northbridge.asl b/src/soc/intel/apollolake/acpi/northbridge.asl
index 1450983654..6a71900e7f 100644
--- a/src/soc/intel/apollolake/acpi/northbridge.asl
+++ b/src/soc/intel/apollolake/acpi/northbridge.asl
@@ -114,3 +114,6 @@ Method (_CRS, 0, Serialized)
Return (MCRS)
}
+
+/* GFX 00:02.0 */
+#include <drivers/intel/gma/acpi/gfx.asl>
diff --git a/src/soc/intel/apollolake/acpi/southbridge.asl b/src/soc/intel/apollolake/acpi/southbridge.asl
index 4d4e4dc6fe..f4d1497223 100644
--- a/src/soc/intel/apollolake/acpi/southbridge.asl
+++ b/src/soc/intel/apollolake/acpi/southbridge.asl
@@ -17,9 +17,6 @@
#include "xhci.asl"
-/* GFX 00:02.0 */
-#include <drivers/intel/gma/acpi/gfx.asl>
-
/* LPC */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl
index f091d8f500..01c22508c2 100644
--- a/src/soc/intel/cannonlake/acpi/southbridge.asl
+++ b/src/soc/intel/cannonlake/acpi/southbridge.asl
@@ -16,9 +16,6 @@
#include "gpio.asl"
#endif
-/* GFX 00:02.0 */
-#include <drivers/intel/gma/acpi/gfx.asl>
-
/* LPC 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
diff --git a/src/soc/intel/common/block/acpi/acpi/northbridge.asl b/src/soc/intel/common/block/acpi/acpi/northbridge.asl
index 5780f4c799..89495a9e45 100644
--- a/src/soc/intel/common/block/acpi/acpi/northbridge.asl
+++ b/src/soc/intel/common/block/acpi/acpi/northbridge.asl
@@ -309,3 +309,6 @@ Device (PDRC)
Return (BUF0)
}
}
+
+/* GFX 00:02.0 */
+#include <drivers/intel/gma/acpi/gfx.asl>
diff --git a/src/soc/intel/elkhartlake/acpi/southbridge.asl b/src/soc/intel/elkhartlake/acpi/southbridge.asl
index 02425c444b..ccad7760a3 100644
--- a/src/soc/intel/elkhartlake/acpi/southbridge.asl
+++ b/src/soc/intel/elkhartlake/acpi/southbridge.asl
@@ -14,9 +14,6 @@
/* GPIO controller */
#include "gpio.asl"
-/* GFX 00:02.0 */
-#include <drivers/intel/gma/acpi/gfx.asl>
-
/* ESPI 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
diff --git a/src/soc/intel/icelake/acpi/southbridge.asl b/src/soc/intel/icelake/acpi/southbridge.asl
index 925f28f816..4abea7c6f9 100644
--- a/src/soc/intel/icelake/acpi/southbridge.asl
+++ b/src/soc/intel/icelake/acpi/southbridge.asl
@@ -17,9 +17,6 @@
/* GPIO controller */
#include "gpio.asl"
-/* GFX 00:02.0 */
-#include <drivers/intel/gma/acpi/gfx.asl>
-
/* ESPI 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
diff --git a/src/soc/intel/jasperlake/acpi/southbridge.asl b/src/soc/intel/jasperlake/acpi/southbridge.asl
index b97ec58f36..e623cc35a9 100644
--- a/src/soc/intel/jasperlake/acpi/southbridge.asl
+++ b/src/soc/intel/jasperlake/acpi/southbridge.asl
@@ -17,9 +17,6 @@
/* GPIO controller */
#include "gpio.asl"
-/* GFX 00:02.0 */
-#include <drivers/intel/gma/acpi/gfx.asl>
-
/* ESPI 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
diff --git a/src/soc/intel/skylake/acpi/pch.asl b/src/soc/intel/skylake/acpi/pch.asl
index d2e922c359..136e5c4186 100644
--- a/src/soc/intel/skylake/acpi/pch.asl
+++ b/src/soc/intel/skylake/acpi/pch.asl
@@ -66,8 +66,5 @@ Method (_OSC, 4)
#include <soc/intel/common/acpi/sgx.asl>
#endif
-/* Integrated graphics 0:2.0 */
-#include <drivers/intel/gma/acpi/gfx.asl>
-
/* Intel Power Engine Plug-in */
#include <soc/intel/common/block/acpi/acpi/pep.asl>
diff --git a/src/soc/intel/skylake/acpi/systemagent.asl b/src/soc/intel/skylake/acpi/systemagent.asl
index d1441c4322..709e1f78c5 100644
--- a/src/soc/intel/skylake/acpi/systemagent.asl
+++ b/src/soc/intel/skylake/acpi/systemagent.asl
@@ -322,3 +322,6 @@ Device (PDRC)
Return (BUF0)
}
}
+
+/* Integrated graphics 0:2.0 */
+#include <drivers/intel/gma/acpi/gfx.asl>
diff --git a/src/soc/intel/tigerlake/acpi/southbridge.asl b/src/soc/intel/tigerlake/acpi/southbridge.asl
index 744b7ef50a..3a53f2c9d1 100644
--- a/src/soc/intel/tigerlake/acpi/southbridge.asl
+++ b/src/soc/intel/tigerlake/acpi/southbridge.asl
@@ -17,9 +17,6 @@
/* GPIO controller */
#include "gpio.asl"
-/* GFX 00:02.0 */
-#include <drivers/intel/gma/acpi/gfx.asl>
-
/* ESPI 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>