From aa3cac14abe1b2f49102c4e40b14d34066b9432c Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Fri, 1 Mar 2024 10:46:52 -0700
Subject: [PATCH] mb/system76: Use default GMA brightness levels

This reverts commit 1f81af52a4ef ("mb/system76: Add custom backlight
levels for Intel GMA").

Defaulting to 40% can make the screen hard to read as System76's
firmware setup uses white text on a gray background.

Change-Id: I13ab3797319c4db6e800737a3f4e4344e3b588f3
Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 src/mainboard/system76/adl/acpi/backlight.asl | 31 -------------------
 src/mainboard/system76/adl/acpi/mainboard.asl |  2 --
 src/mainboard/system76/adl/dsdt.asl           |  1 +
 .../system76/cml-u/acpi/backlight.asl         | 31 -------------------
 .../system76/cml-u/acpi/mainboard.asl         |  3 --
 src/mainboard/system76/cml-u/dsdt.asl         |  1 +
 .../system76/gaze15/acpi/backlight.asl        | 31 -------------------
 .../system76/gaze15/acpi/mainboard.asl        |  1 -
 src/mainboard/system76/gaze15/dsdt.asl        |  1 +
 .../system76/kbl-u/acpi/backlight.asl         | 31 -------------------
 .../system76/kbl-u/acpi/mainboard.asl         |  4 ---
 src/mainboard/system76/kbl-u/dsdt.asl         |  1 +
 .../system76/oryp5/acpi/backlight.asl         | 31 -------------------
 .../system76/oryp5/acpi/mainboard.asl         |  1 -
 src/mainboard/system76/oryp5/dsdt.asl         |  1 +
 .../system76/oryp6/acpi/backlight.asl         | 31 -------------------
 .../system76/oryp6/acpi/mainboard.asl         |  1 -
 src/mainboard/system76/oryp6/dsdt.asl         |  1 +
 src/mainboard/system76/rpl/acpi/backlight.asl | 31 -------------------
 src/mainboard/system76/rpl/acpi/mainboard.asl |  2 --
 src/mainboard/system76/rpl/dsdt.asl           |  1 +
 .../system76/tgl-h/acpi/backlight.asl         | 31 -------------------
 .../system76/tgl-h/acpi/mainboard.asl         |  1 -
 src/mainboard/system76/tgl-h/dsdt.asl         |  1 +
 .../system76/tgl-u/acpi/backlight.asl         | 31 -------------------
 .../system76/tgl-u/acpi/mainboard.asl         |  1 -
 src/mainboard/system76/tgl-u/dsdt.asl         |  1 +
 .../system76/whl-u/acpi/backlight.asl         | 31 -------------------
 .../system76/whl-u/acpi/mainboard.asl         |  3 --
 src/mainboard/system76/whl-u/dsdt.asl         |  1 +
 30 files changed, 10 insertions(+), 329 deletions(-)
 delete mode 100644 src/mainboard/system76/adl/acpi/backlight.asl
 delete mode 100644 src/mainboard/system76/cml-u/acpi/backlight.asl
 delete mode 100644 src/mainboard/system76/gaze15/acpi/backlight.asl
 delete mode 100644 src/mainboard/system76/kbl-u/acpi/backlight.asl
 delete mode 100644 src/mainboard/system76/oryp5/acpi/backlight.asl
 delete mode 100644 src/mainboard/system76/oryp6/acpi/backlight.asl
 delete mode 100644 src/mainboard/system76/rpl/acpi/backlight.asl
 delete mode 100644 src/mainboard/system76/tgl-h/acpi/backlight.asl
 delete mode 100644 src/mainboard/system76/tgl-u/acpi/backlight.asl
 delete mode 100644 src/mainboard/system76/whl-u/acpi/backlight.asl

diff --git a/src/mainboard/system76/adl/acpi/backlight.asl b/src/mainboard/system76/adl/acpi/backlight.asl
deleted file mode 100644
index f020234450..0000000000
--- a/src/mainboard/system76/adl/acpi/backlight.asl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <drivers/intel/gma/acpi/gma.asl>
-
-Scope (GFX0)
-{
-	Name (BRIG, Package (22) {
-		40, /* default AC */
-		40, /* default Battery */
-		5,
-		10,
-		15,
-		20,
-		25,
-		30,
-		35,
-		40,
-		45,
-		50,
-		55,
-		60,
-		65,
-		70,
-		75,
-		80,
-		85,
-		90,
-		95,
-		100
-	})
-}
diff --git a/src/mainboard/system76/adl/acpi/mainboard.asl b/src/mainboard/system76/adl/acpi/mainboard.asl
index f7453fc339..88a968326a 100644
--- a/src/mainboard/system76/adl/acpi/mainboard.asl
+++ b/src/mainboard/system76/adl/acpi/mainboard.asl
@@ -11,8 +11,6 @@
 Scope (\_SB) {
 	#include "sleep.asl"
 	Scope (PCI0) {
-		#include "backlight.asl"
-
 #if CONFIG(DRIVERS_GFX_NVIDIA)
 		Scope (PEG2) {
 			#include <drivers/gfx/nvidia/acpi/tigerlake.asl>
diff --git a/src/mainboard/system76/adl/dsdt.asl b/src/mainboard/system76/adl/dsdt.asl
index cbf9e6a7e9..f20df7ea4f 100644
--- a/src/mainboard/system76/adl/dsdt.asl
+++ b/src/mainboard/system76/adl/dsdt.asl
@@ -20,6 +20,7 @@ DefinitionBlock(
 		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
 		#include <soc/intel/alderlake/acpi/southbridge.asl>
 		#include <soc/intel/alderlake/acpi/tcss.asl>
+		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/system76/cml-u/acpi/backlight.asl b/src/mainboard/system76/cml-u/acpi/backlight.asl
deleted file mode 100644
index f020234450..0000000000
--- a/src/mainboard/system76/cml-u/acpi/backlight.asl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <drivers/intel/gma/acpi/gma.asl>
-
-Scope (GFX0)
-{
-	Name (BRIG, Package (22) {
-		40, /* default AC */
-		40, /* default Battery */
-		5,
-		10,
-		15,
-		20,
-		25,
-		30,
-		35,
-		40,
-		45,
-		50,
-		55,
-		60,
-		65,
-		70,
-		75,
-		80,
-		85,
-		90,
-		95,
-		100
-	})
-}
diff --git a/src/mainboard/system76/cml-u/acpi/mainboard.asl b/src/mainboard/system76/cml-u/acpi/mainboard.asl
index 3335ba8fdd..416cc5a151 100644
--- a/src/mainboard/system76/cml-u/acpi/mainboard.asl
+++ b/src/mainboard/system76/cml-u/acpi/mainboard.asl
@@ -6,9 +6,6 @@
 
 Scope (\_SB) {
 	#include "sleep.asl"
-	Scope (PCI0) {
-		#include "backlight.asl"
-	}
 }
 
 Scope (\_GPE) {
diff --git a/src/mainboard/system76/cml-u/dsdt.asl b/src/mainboard/system76/cml-u/dsdt.asl
index b633254edd..982e226118 100644
--- a/src/mainboard/system76/cml-u/dsdt.asl
+++ b/src/mainboard/system76/cml-u/dsdt.asl
@@ -19,6 +19,7 @@ DefinitionBlock(
 	{
 		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
 		#include <soc/intel/cannonlake/acpi/southbridge.asl>
+		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/system76/gaze15/acpi/backlight.asl b/src/mainboard/system76/gaze15/acpi/backlight.asl
deleted file mode 100644
index f020234450..0000000000
--- a/src/mainboard/system76/gaze15/acpi/backlight.asl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <drivers/intel/gma/acpi/gma.asl>
-
-Scope (GFX0)
-{
-	Name (BRIG, Package (22) {
-		40, /* default AC */
-		40, /* default Battery */
-		5,
-		10,
-		15,
-		20,
-		25,
-		30,
-		35,
-		40,
-		45,
-		50,
-		55,
-		60,
-		65,
-		70,
-		75,
-		80,
-		85,
-		90,
-		95,
-		100
-	})
-}
diff --git a/src/mainboard/system76/gaze15/acpi/mainboard.asl b/src/mainboard/system76/gaze15/acpi/mainboard.asl
index 610cdd12ba..2f01acc0bc 100644
--- a/src/mainboard/system76/gaze15/acpi/mainboard.asl
+++ b/src/mainboard/system76/gaze15/acpi/mainboard.asl
@@ -9,7 +9,6 @@
 Scope (\_SB) {
 	#include "sleep.asl"
 	Scope (PCI0) {
-		#include "backlight.asl"
 		Device (PEGP) {
 			Name (_ADR, CONFIG_DRIVERS_GFX_NVIDIA_BRIDGE << 16)
 			#include <drivers/gfx/nvidia/acpi/coffeelake.asl>
diff --git a/src/mainboard/system76/gaze15/dsdt.asl b/src/mainboard/system76/gaze15/dsdt.asl
index a48382b578..d2bd57d78a 100644
--- a/src/mainboard/system76/gaze15/dsdt.asl
+++ b/src/mainboard/system76/gaze15/dsdt.asl
@@ -18,6 +18,7 @@ DefinitionBlock(
 	Device (\_SB.PCI0) {
 		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
 		#include <soc/intel/cannonlake/acpi/southbridge.asl>
+		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/system76/kbl-u/acpi/backlight.asl b/src/mainboard/system76/kbl-u/acpi/backlight.asl
deleted file mode 100644
index f020234450..0000000000
--- a/src/mainboard/system76/kbl-u/acpi/backlight.asl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <drivers/intel/gma/acpi/gma.asl>
-
-Scope (GFX0)
-{
-	Name (BRIG, Package (22) {
-		40, /* default AC */
-		40, /* default Battery */
-		5,
-		10,
-		15,
-		20,
-		25,
-		30,
-		35,
-		40,
-		45,
-		50,
-		55,
-		60,
-		65,
-		70,
-		75,
-		80,
-		85,
-		90,
-		95,
-		100
-	})
-}
diff --git a/src/mainboard/system76/kbl-u/acpi/mainboard.asl b/src/mainboard/system76/kbl-u/acpi/mainboard.asl
index a36923f467..11735e8e01 100644
--- a/src/mainboard/system76/kbl-u/acpi/mainboard.asl
+++ b/src/mainboard/system76/kbl-u/acpi/mainboard.asl
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 Scope (\_SB) {
-	Scope (PCI0) {
-		#include "backlight.asl"
-	}
-
 	#include "ac.asl"
 	#include "battery.asl"
 	#include "buttons.asl"
diff --git a/src/mainboard/system76/kbl-u/dsdt.asl b/src/mainboard/system76/kbl-u/dsdt.asl
index f93c3f68a8..8607cad463 100644
--- a/src/mainboard/system76/kbl-u/dsdt.asl
+++ b/src/mainboard/system76/kbl-u/dsdt.asl
@@ -19,6 +19,7 @@ DefinitionBlock(
 	{
 		#include <soc/intel/skylake/acpi/systemagent.asl>
 		#include <soc/intel/skylake/acpi/pch.asl>
+		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/system76/oryp5/acpi/backlight.asl b/src/mainboard/system76/oryp5/acpi/backlight.asl
deleted file mode 100644
index f020234450..0000000000
--- a/src/mainboard/system76/oryp5/acpi/backlight.asl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <drivers/intel/gma/acpi/gma.asl>
-
-Scope (GFX0)
-{
-	Name (BRIG, Package (22) {
-		40, /* default AC */
-		40, /* default Battery */
-		5,
-		10,
-		15,
-		20,
-		25,
-		30,
-		35,
-		40,
-		45,
-		50,
-		55,
-		60,
-		65,
-		70,
-		75,
-		80,
-		85,
-		90,
-		95,
-		100
-	})
-}
diff --git a/src/mainboard/system76/oryp5/acpi/mainboard.asl b/src/mainboard/system76/oryp5/acpi/mainboard.asl
index f816e3f2da..e0132f0d23 100644
--- a/src/mainboard/system76/oryp5/acpi/mainboard.asl
+++ b/src/mainboard/system76/oryp5/acpi/mainboard.asl
@@ -10,7 +10,6 @@ Scope (\_SB)
 {
 	#include "sleep.asl"
 	Scope (PCI0) {
-		#include "backlight.asl"
 		Device (PEGP) {
 			Name (_ADR, CONFIG_DRIVERS_GFX_NVIDIA_BRIDGE << 16)
 			#include <drivers/gfx/nvidia/acpi/coffeelake.asl>
diff --git a/src/mainboard/system76/oryp5/dsdt.asl b/src/mainboard/system76/oryp5/dsdt.asl
index b633254edd..982e226118 100644
--- a/src/mainboard/system76/oryp5/dsdt.asl
+++ b/src/mainboard/system76/oryp5/dsdt.asl
@@ -19,6 +19,7 @@ DefinitionBlock(
 	{
 		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
 		#include <soc/intel/cannonlake/acpi/southbridge.asl>
+		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/system76/oryp6/acpi/backlight.asl b/src/mainboard/system76/oryp6/acpi/backlight.asl
deleted file mode 100644
index f020234450..0000000000
--- a/src/mainboard/system76/oryp6/acpi/backlight.asl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <drivers/intel/gma/acpi/gma.asl>
-
-Scope (GFX0)
-{
-	Name (BRIG, Package (22) {
-		40, /* default AC */
-		40, /* default Battery */
-		5,
-		10,
-		15,
-		20,
-		25,
-		30,
-		35,
-		40,
-		45,
-		50,
-		55,
-		60,
-		65,
-		70,
-		75,
-		80,
-		85,
-		90,
-		95,
-		100
-	})
-}
diff --git a/src/mainboard/system76/oryp6/acpi/mainboard.asl b/src/mainboard/system76/oryp6/acpi/mainboard.asl
index 610cdd12ba..2f01acc0bc 100644
--- a/src/mainboard/system76/oryp6/acpi/mainboard.asl
+++ b/src/mainboard/system76/oryp6/acpi/mainboard.asl
@@ -9,7 +9,6 @@
 Scope (\_SB) {
 	#include "sleep.asl"
 	Scope (PCI0) {
-		#include "backlight.asl"
 		Device (PEGP) {
 			Name (_ADR, CONFIG_DRIVERS_GFX_NVIDIA_BRIDGE << 16)
 			#include <drivers/gfx/nvidia/acpi/coffeelake.asl>
diff --git a/src/mainboard/system76/oryp6/dsdt.asl b/src/mainboard/system76/oryp6/dsdt.asl
index a48382b578..d2bd57d78a 100644
--- a/src/mainboard/system76/oryp6/dsdt.asl
+++ b/src/mainboard/system76/oryp6/dsdt.asl
@@ -18,6 +18,7 @@ DefinitionBlock(
 	Device (\_SB.PCI0) {
 		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
 		#include <soc/intel/cannonlake/acpi/southbridge.asl>
+		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/system76/rpl/acpi/backlight.asl b/src/mainboard/system76/rpl/acpi/backlight.asl
deleted file mode 100644
index f020234450..0000000000
--- a/src/mainboard/system76/rpl/acpi/backlight.asl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <drivers/intel/gma/acpi/gma.asl>
-
-Scope (GFX0)
-{
-	Name (BRIG, Package (22) {
-		40, /* default AC */
-		40, /* default Battery */
-		5,
-		10,
-		15,
-		20,
-		25,
-		30,
-		35,
-		40,
-		45,
-		50,
-		55,
-		60,
-		65,
-		70,
-		75,
-		80,
-		85,
-		90,
-		95,
-		100
-	})
-}
diff --git a/src/mainboard/system76/rpl/acpi/mainboard.asl b/src/mainboard/system76/rpl/acpi/mainboard.asl
index 288522ae9d..542cefe2fc 100644
--- a/src/mainboard/system76/rpl/acpi/mainboard.asl
+++ b/src/mainboard/system76/rpl/acpi/mainboard.asl
@@ -11,8 +11,6 @@
 Scope (\_SB) {
 	#include "sleep.asl"
 	Scope (PCI0) {
-		#include "backlight.asl"
-
 #if CONFIG(DRIVERS_GFX_NVIDIA)
 #if CONFIG(SOC_INTEL_ALDERLAKE_PCH_P) || CONFIG(BOARD_SYSTEM76_BONW15)
 		Scope (PEG2) {
diff --git a/src/mainboard/system76/rpl/dsdt.asl b/src/mainboard/system76/rpl/dsdt.asl
index cbf9e6a7e9..f20df7ea4f 100644
--- a/src/mainboard/system76/rpl/dsdt.asl
+++ b/src/mainboard/system76/rpl/dsdt.asl
@@ -20,6 +20,7 @@ DefinitionBlock(
 		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
 		#include <soc/intel/alderlake/acpi/southbridge.asl>
 		#include <soc/intel/alderlake/acpi/tcss.asl>
+		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/system76/tgl-h/acpi/backlight.asl b/src/mainboard/system76/tgl-h/acpi/backlight.asl
deleted file mode 100644
index f020234450..0000000000
--- a/src/mainboard/system76/tgl-h/acpi/backlight.asl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <drivers/intel/gma/acpi/gma.asl>
-
-Scope (GFX0)
-{
-	Name (BRIG, Package (22) {
-		40, /* default AC */
-		40, /* default Battery */
-		5,
-		10,
-		15,
-		20,
-		25,
-		30,
-		35,
-		40,
-		45,
-		50,
-		55,
-		60,
-		65,
-		70,
-		75,
-		80,
-		85,
-		90,
-		95,
-		100
-	})
-}
diff --git a/src/mainboard/system76/tgl-h/acpi/mainboard.asl b/src/mainboard/system76/tgl-h/acpi/mainboard.asl
index 1cf2a28bca..a65455124e 100644
--- a/src/mainboard/system76/tgl-h/acpi/mainboard.asl
+++ b/src/mainboard/system76/tgl-h/acpi/mainboard.asl
@@ -9,7 +9,6 @@
 Scope (\_SB) {
 	#include "sleep.asl"
 	Scope (PCI0) {
-		#include "backlight.asl"
 		Scope (PEG1) {
 			#include <drivers/gfx/nvidia/acpi/tigerlake.asl>
 		}
diff --git a/src/mainboard/system76/tgl-h/dsdt.asl b/src/mainboard/system76/tgl-h/dsdt.asl
index 904073cc7d..fb40a5d67f 100644
--- a/src/mainboard/system76/tgl-h/dsdt.asl
+++ b/src/mainboard/system76/tgl-h/dsdt.asl
@@ -20,6 +20,7 @@ DefinitionBlock(
 		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
 		#include <soc/intel/tigerlake/acpi/southbridge.asl>
 		#include <soc/intel/tigerlake/acpi/tcss.asl>
+		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/system76/tgl-u/acpi/backlight.asl b/src/mainboard/system76/tgl-u/acpi/backlight.asl
deleted file mode 100644
index f020234450..0000000000
--- a/src/mainboard/system76/tgl-u/acpi/backlight.asl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <drivers/intel/gma/acpi/gma.asl>
-
-Scope (GFX0)
-{
-	Name (BRIG, Package (22) {
-		40, /* default AC */
-		40, /* default Battery */
-		5,
-		10,
-		15,
-		20,
-		25,
-		30,
-		35,
-		40,
-		45,
-		50,
-		55,
-		60,
-		65,
-		70,
-		75,
-		80,
-		85,
-		90,
-		95,
-		100
-	})
-}
diff --git a/src/mainboard/system76/tgl-u/acpi/mainboard.asl b/src/mainboard/system76/tgl-u/acpi/mainboard.asl
index 6adceba1fd..fcc4f04059 100644
--- a/src/mainboard/system76/tgl-u/acpi/mainboard.asl
+++ b/src/mainboard/system76/tgl-u/acpi/mainboard.asl
@@ -11,7 +11,6 @@
 Scope (\_SB) {
 	#include "sleep.asl"
 	Scope (PCI0) {
-		#include "backlight.asl"
 #if CONFIG(BOARD_SYSTEM76_GALP5)
 		Scope (RP01) { // Remapped from RP05
 			#include <drivers/gfx/nvidia/acpi/tigerlake.asl>
diff --git a/src/mainboard/system76/tgl-u/dsdt.asl b/src/mainboard/system76/tgl-u/dsdt.asl
index 904073cc7d..fb40a5d67f 100644
--- a/src/mainboard/system76/tgl-u/dsdt.asl
+++ b/src/mainboard/system76/tgl-u/dsdt.asl
@@ -20,6 +20,7 @@ DefinitionBlock(
 		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
 		#include <soc/intel/tigerlake/acpi/southbridge.asl>
 		#include <soc/intel/tigerlake/acpi/tcss.asl>
+		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/system76/whl-u/acpi/backlight.asl b/src/mainboard/system76/whl-u/acpi/backlight.asl
deleted file mode 100644
index f020234450..0000000000
--- a/src/mainboard/system76/whl-u/acpi/backlight.asl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <drivers/intel/gma/acpi/gma.asl>
-
-Scope (GFX0)
-{
-	Name (BRIG, Package (22) {
-		40, /* default AC */
-		40, /* default Battery */
-		5,
-		10,
-		15,
-		20,
-		25,
-		30,
-		35,
-		40,
-		45,
-		50,
-		55,
-		60,
-		65,
-		70,
-		75,
-		80,
-		85,
-		90,
-		95,
-		100
-	})
-}
diff --git a/src/mainboard/system76/whl-u/acpi/mainboard.asl b/src/mainboard/system76/whl-u/acpi/mainboard.asl
index 2495377d68..ade0bb2625 100644
--- a/src/mainboard/system76/whl-u/acpi/mainboard.asl
+++ b/src/mainboard/system76/whl-u/acpi/mainboard.asl
@@ -6,9 +6,6 @@
 
 Scope (\_SB) {
 	#include "sleep.asl"
-	Scope (PCI0) {
-		#include "backlight.asl"
-	}
 }
 
 Scope (\_GPE) {
diff --git a/src/mainboard/system76/whl-u/dsdt.asl b/src/mainboard/system76/whl-u/dsdt.asl
index b633254edd..982e226118 100644
--- a/src/mainboard/system76/whl-u/dsdt.asl
+++ b/src/mainboard/system76/whl-u/dsdt.asl
@@ -19,6 +19,7 @@ DefinitionBlock(
 	{
 		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
 		#include <soc/intel/cannonlake/acpi/southbridge.asl>
+		#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>