Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39878 )
Change subject: drivers/intel/gma: fold gma.asl into default_brightness_levels.asl ......................................................................
drivers/intel/gma: fold gma.asl into default_brightness_levels.asl
Including gma.asl at the platform level (vs the board level) means that even desktop boards need to include the default brightness levels, which makes no sense. To begin to clean this up, include gma.asl in default_brightness_levels.asl (as well as the handful of board-specific brightness files) and remove it from the various platforms.
A follow-on commit will remove default_brightness_levels.asl from all boards which lack an internal display.
Change-Id: I8063deeef4ab6d6ab34ed9b0be5b1d541d6e9b6b Signed-off-by: Matt DeVillier matt.devillier@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/39878 Reviewed-by: Benjamin Doron benjamin.doron00@gmail.com Reviewed-by: Nico Huber nico.h@gmx.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/drivers/intel/gma/acpi/default_brightness_levels.asl M src/mainboard/roda/rv11/variants/rv11/include/acpi/brightness_levels.asl M src/mainboard/roda/rv11/variants/rw11/include/acpi/brightness_levels.asl M src/northbridge/intel/gm45/acpi/gm45.asl M src/northbridge/intel/haswell/acpi/haswell.asl M src/northbridge/intel/ironlake/acpi/ironlake.asl M src/northbridge/intel/sandybridge/acpi/sandybridge.asl M src/northbridge/intel/x4x/acpi/x4x.asl 8 files changed, 6 insertions(+), 15 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Benjamin Doron: Looks good to me, but someone else must approve
diff --git a/src/drivers/intel/gma/acpi/default_brightness_levels.asl b/src/drivers/intel/gma/acpi/default_brightness_levels.asl index 6c6f35e..b584c09 100644 --- a/src/drivers/intel/gma/acpi/default_brightness_levels.asl +++ b/src/drivers/intel/gma/acpi/default_brightness_levels.asl @@ -1,3 +1,5 @@ +#include "gma.asl" + Scope (GFX0) { Name (BRIG, Package (0x12) diff --git a/src/mainboard/roda/rv11/variants/rv11/include/acpi/brightness_levels.asl b/src/mainboard/roda/rv11/variants/rv11/include/acpi/brightness_levels.asl index 70732c8..b92589a 100644 --- a/src/mainboard/roda/rv11/variants/rv11/include/acpi/brightness_levels.asl +++ b/src/mainboard/roda/rv11/variants/rv11/include/acpi/brightness_levels.asl @@ -11,6 +11,8 @@ * GNU General Public License for more details. */
+#include <drivers/intel/gma/acpi/gma.asl> + Scope (GFX0) { Name (BRIG, Package (13) diff --git a/src/mainboard/roda/rv11/variants/rw11/include/acpi/brightness_levels.asl b/src/mainboard/roda/rv11/variants/rw11/include/acpi/brightness_levels.asl index 52a4568..506de01 100644 --- a/src/mainboard/roda/rv11/variants/rw11/include/acpi/brightness_levels.asl +++ b/src/mainboard/roda/rv11/variants/rw11/include/acpi/brightness_levels.asl @@ -11,6 +11,8 @@ * GNU General Public License for more details. */
+#include <drivers/intel/gma/acpi/gma.asl> + Scope (GFX0) { Name (BRIG, Package (13) diff --git a/src/northbridge/intel/gm45/acpi/gm45.asl b/src/northbridge/intel/gm45/acpi/gm45.asl index 8a30212..576ab96 100644 --- a/src/northbridge/intel/gm45/acpi/gm45.asl +++ b/src/northbridge/intel/gm45/acpi/gm45.asl @@ -73,6 +73,3 @@
// PCIe graphics port 0:1.0 #include "peg.asl" - -// Integrated graphics 0:2.0 -#include <drivers/intel/gma/acpi/gma.asl> diff --git a/src/northbridge/intel/haswell/acpi/haswell.asl b/src/northbridge/intel/haswell/acpi/haswell.asl index 900c6c3..03b17ab 100644 --- a/src/northbridge/intel/haswell/acpi/haswell.asl +++ b/src/northbridge/intel/haswell/acpi/haswell.asl @@ -46,6 +46,3 @@ Return(PDRS) } } - -// Integrated graphics 0:2.0 -#include <drivers/intel/gma/acpi/gma.asl> diff --git a/src/northbridge/intel/ironlake/acpi/ironlake.asl b/src/northbridge/intel/ironlake/acpi/ironlake.asl index 2997dea..61db605 100644 --- a/src/northbridge/intel/ironlake/acpi/ironlake.asl +++ b/src/northbridge/intel/ironlake/acpi/ironlake.asl @@ -49,6 +49,3 @@ Return(PDRS) } } - -// Integrated graphics 0:2.0 -#include <drivers/intel/gma/acpi/gma.asl> diff --git a/src/northbridge/intel/sandybridge/acpi/sandybridge.asl b/src/northbridge/intel/sandybridge/acpi/sandybridge.asl index 202671a..2dd5c00 100644 --- a/src/northbridge/intel/sandybridge/acpi/sandybridge.asl +++ b/src/northbridge/intel/sandybridge/acpi/sandybridge.asl @@ -53,6 +53,3 @@ Return(PDRS) } } - -// Integrated graphics 0:2.0 -#include <drivers/intel/gma/acpi/gma.asl> diff --git a/src/northbridge/intel/x4x/acpi/x4x.asl b/src/northbridge/intel/x4x/acpi/x4x.asl index 09849e3..947b678 100644 --- a/src/northbridge/intel/x4x/acpi/x4x.asl +++ b/src/northbridge/intel/x4x/acpi/x4x.asl @@ -43,6 +43,3 @@
// PCIe graphics port 0:1.0 #include "peg.asl" - -// Integrated graphics 0:2.0 -#include <drivers/intel/gma/acpi/gma.asl>