summaryrefslogtreecommitdiff
path: root/src/northbridge
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2020-11-28 13:17:54 -0600
committerMichael Niewöhner <foss@mniewoehner.de>2020-12-30 16:35:36 +0000
commitc6589aefc16dc8911bc07c2fbdf2e81efe732796 (patch)
tree4857b52d4de5347a807e7d258b3a321dbd61d73a /src/northbridge
parent5cf4c87da70b11e0b9dcb2f7bcb31b537811ca86 (diff)
drivers/intel/gma: Include gfx.asl by default for all platforms...
which select INTEL_GMA_ACPI. Rework brightness level includes and platform-level asl files to avoid duplicate device definition for GFX0. Include gfx.asl for Skylake/Kabylake, since all other soc/intel/common platforms already do. Adjust mb/51nb/x210 to prevent device redefinition. Some OSes (e.g. Windows, MacOS) require/prefer the ACPI device for the IGD to exist, even if ACPI brightness controls are not utilized. This change adds a GFX0 ACPI device for all boards whose platforms select INTEL_GMA_ACPI without requiring non-functional brightness controls to be added at the board level. Change-Id: Ie71bd5fc7acd926b7ce7da17fbc108670fd453e0 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48862 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Diffstat (limited to 'src/northbridge')
-rw-r--r--src/northbridge/intel/gm45/acpi/gm45.asl3
-rw-r--r--src/northbridge/intel/haswell/acpi/hostbridge.asl3
-rw-r--r--src/northbridge/intel/i945/acpi/i945.asl1
-rw-r--r--src/northbridge/intel/i945/acpi/igd.asl4
-rw-r--r--src/northbridge/intel/ironlake/acpi/ironlake.asl3
-rw-r--r--src/northbridge/intel/pineview/acpi/pineview.asl3
-rw-r--r--src/northbridge/intel/sandybridge/acpi/sandybridge.asl3
-rw-r--r--src/northbridge/intel/x4x/acpi/x4x.asl3
8 files changed, 20 insertions, 3 deletions
diff --git a/src/northbridge/intel/gm45/acpi/gm45.asl b/src/northbridge/intel/gm45/acpi/gm45.asl
index e4d8d66993..f13133d6ef 100644
--- a/src/northbridge/intel/gm45/acpi/gm45.asl
+++ b/src/northbridge/intel/gm45/acpi/gm45.asl
@@ -33,3 +33,6 @@ Device (PDRC)
// PCIe graphics port 0:1.0
#include "peg.asl"
+
+// Integrated graphics 0:2.0
+#include <drivers/intel/gma/acpi/gfx.asl>
diff --git a/src/northbridge/intel/haswell/acpi/hostbridge.asl b/src/northbridge/intel/haswell/acpi/hostbridge.asl
index 28a33d842c..a930afe875 100644
--- a/src/northbridge/intel/haswell/acpi/hostbridge.asl
+++ b/src/northbridge/intel/haswell/acpi/hostbridge.asl
@@ -204,3 +204,6 @@ Device (PDRC)
/* PCI Express Graphics */
#include "peg.asl"
#endif
+
+/* Integrated graphics 0:2.0 */
+#include <drivers/intel/gma/acpi/gfx.asl>
diff --git a/src/northbridge/intel/i945/acpi/i945.asl b/src/northbridge/intel/i945/acpi/i945.asl
index cdc77b5fa7..c2142cc50a 100644
--- a/src/northbridge/intel/i945/acpi/i945.asl
+++ b/src/northbridge/intel/i945/acpi/i945.asl
@@ -77,4 +77,5 @@ Device (PDRC)
#include "peg.asl"
// Integrated graphics 0:2.0
+#include <drivers/intel/gma/acpi/gfx.asl>
#include "igd.asl"
diff --git a/src/northbridge/intel/i945/acpi/igd.asl b/src/northbridge/intel/i945/acpi/igd.asl
index 5258c52672..4fc2da2558 100644
--- a/src/northbridge/intel/i945/acpi/igd.asl
+++ b/src/northbridge/intel/i945/acpi/igd.asl
@@ -1,9 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-Device (GFX0)
+Scope (GFX0)
{
- Name (_ADR, 0x00020000)
-
Name (BRIG, Package (0x12)
{
0xf,
diff --git a/src/northbridge/intel/ironlake/acpi/ironlake.asl b/src/northbridge/intel/ironlake/acpi/ironlake.asl
index 3cf597daf7..4f9549c219 100644
--- a/src/northbridge/intel/ironlake/acpi/ironlake.asl
+++ b/src/northbridge/intel/ironlake/acpi/ironlake.asl
@@ -36,3 +36,6 @@ Device (PDRC)
Return(PDRS)
}
}
+
+/* Integrated graphics 0:2.0 */
+#include <drivers/intel/gma/acpi/gfx.asl>
diff --git a/src/northbridge/intel/pineview/acpi/pineview.asl b/src/northbridge/intel/pineview/acpi/pineview.asl
index 9515c317a9..5fb2b1233e 100644
--- a/src/northbridge/intel/pineview/acpi/pineview.asl
+++ b/src/northbridge/intel/pineview/acpi/pineview.asl
@@ -32,3 +32,6 @@ Device (PDRC)
// PCIe graphics port 0:1.0
#include "peg.asl"
+
+// Integrated graphics 0:2.0
+#include <drivers/intel/gma/acpi/gfx.asl>
diff --git a/src/northbridge/intel/sandybridge/acpi/sandybridge.asl b/src/northbridge/intel/sandybridge/acpi/sandybridge.asl
index 728d8e3ff5..1e47c1f21b 100644
--- a/src/northbridge/intel/sandybridge/acpi/sandybridge.asl
+++ b/src/northbridge/intel/sandybridge/acpi/sandybridge.asl
@@ -52,3 +52,6 @@ Device (PDRC)
Return(PDRS)
}
}
+
+/* Integrated graphics 0:2.0 */
+#include <drivers/intel/gma/acpi/gfx.asl>
diff --git a/src/northbridge/intel/x4x/acpi/x4x.asl b/src/northbridge/intel/x4x/acpi/x4x.asl
index 5a3c0b6132..b013da7814 100644
--- a/src/northbridge/intel/x4x/acpi/x4x.asl
+++ b/src/northbridge/intel/x4x/acpi/x4x.asl
@@ -30,3 +30,6 @@ Device (PDRC)
// PCIe graphics port 0:1.0
#include "peg.asl"
+
+// Integrated graphics 0:2.0
+#include <drivers/intel/gma/acpi/gfx.asl>