diff --git a/src/mainboard/google/brya/variants/redrix/overridetree.cb b/src/mainboard/google/brya/variants/redrix/overridetree.cb
index cdea07141d..d70871412a 100644
--- a/src/mainboard/google/brya/variants/redrix/overridetree.cb
+++ b/src/mainboard/google/brya/variants/redrix/overridetree.cb
@@ -97,7 +97,7 @@ chip soc/intel/alderlake
 	device domain 0 on
 		device ref igpu on
 			chip drivers/gfx/generic
-				register "device_count" = "1"
+				register "device_count" = "6"
 				# DDIA for eDP
 				register "device[0].name" = ""LCD""
 				# Use ChromeOS privacy screen _HID
@@ -106,37 +106,46 @@ chip soc/intel/alderlake
 				register "device[0].addr" = "0x80010400"
 				register "device[0].privacy.enabled" = "1"
 				register "device[0].privacy.gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H21)"
+				# DDIB for HDMI
+				register "device[1].name" = ""DD01""
+				# TCP0 (DP-1) for port C0
+				register "device[2].name" = ""DD02""
+				register "device[2].use_pld" = "true"
+				register "device[2].pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))"
+				# TCP1 (DP-2) unused
+				register "device[3].name" = ""DD03""
+				# TCP2 (DP-3) for port C2
+				register "device[4].name" = ""DD04""
+				register "device[4].use_pld" = "true"
+				register "device[4].pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))"
+				# TCP3 (DP-4) unused
+				register "device[5].name" = ""DD05""
 				device generic 0 on
 					probe EPS PRIVACY_SCREEN
 				end
 			end
 			chip drivers/gfx/generic
-				register "device_count" = "1"
+				register "device_count" = "6"
 				# DDIA for eDP
 				register "device[0].name" = ""LCD""
+				# DDIB for HDMI
+				register "device[1].name" = ""DD01""
+				# TCP0 (DP-1) for port C0
+				register "device[2].name" = ""DD02""
+				register "device[2].use_pld" = "true"
+				register "device[2].pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))"
+				# TCP1 (DP-2) unused
+				register "device[3].name" = ""DD03""
+				# TCP2 (DP-3) for port C2
+				register "device[4].name" = ""DD04""
+				register "device[4].use_pld" = "true"
+				register "device[4].pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))"
+				# TCP3 (DP-4) unused
+				register "device[5].name" = ""DD05""
 				device generic 0 on
 					probe EPS PRIVACY_SCREEN_ABSENT
 				end
 			end
-			chip drivers/gfx/generic
-				register "device_count" = "5"
-				# eDP already added, so skipped
-				# DDIB for HDMI
-				register "device[0].name" = ""DD01""
-				# TCP0 (DP-1) for port C0
-				register "device[1].name" = ""DD02""
-				register "device[1].use_pld" = "true"
-				register "device[1].pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))"
-				# TCP1 (DP-2) unused
-				register "device[2].name" = ""DD03""
-				# TCP2 (DP-3) for port C2
-				register "device[3].name" = ""DD04""
-				register "device[3].use_pld" = "true"
-				register "device[3].pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))"
-				# TCP3 (DP-4) unused
-				register "device[4].name" = ""DD05""
-				device generic 0 on end
-			end
 		end # Integrated Graphics Device
 		device ref dtt on
 			chip drivers/intel/dptf
diff --git a/src/mainboard/google/brya/variants/redrix4es/overridetree.cb b/src/mainboard/google/brya/variants/redrix4es/overridetree.cb
index 37ddbc70b5..65090610db 100644
--- a/src/mainboard/google/brya/variants/redrix4es/overridetree.cb
+++ b/src/mainboard/google/brya/variants/redrix4es/overridetree.cb
@@ -83,7 +83,7 @@ chip soc/intel/alderlake
 	device domain 0 on
 		device ref igpu on
 			chip drivers/gfx/generic
-				register "device_count" = "1"
+				register "device_count" = "6"
 				# DDIA for eDP
 				register "device[0].name" = ""LCD""
 				# Use ChromeOS privacy screen _HID
@@ -92,37 +92,46 @@ chip soc/intel/alderlake
 				register "device[0].addr" = "0x80010400"
 				register "device[0].privacy.enabled" = "1"
 				register "device[0].privacy.gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H21)"
+				# DDIB for HDMI
+				register "device[1].name" = ""DD01""
+				# TCP0 (DP-1) for port C0
+				register "device[2].name" = ""DD02""
+				register "device[2].use_pld" = "true"
+				register "device[2].pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))"
+				# TCP1 (DP-2) unused
+				register "device[3].name" = ""DD03""
+				# TCP2 (DP-3) for port C2
+				register "device[4].name" = ""DD04""
+				register "device[4].use_pld" = "true"
+				register "device[4].pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))"
+				# TCP3 (DP-4) unused
+				register "device[5].name" = ""DD05""
 				device generic 0 on
 					probe EPS PRIVACY_SCREEN
 				end
 			end
 			chip drivers/gfx/generic
-				register "device_count" = "1"
+				register "device_count" = "6"
 				# DDIA for eDP
 				register "device[0].name" = ""LCD""
+				# DDIB for HDMI
+				register "device[1].name" = ""DD01""
+				# TCP0 (DP-1) for port C0
+				register "device[2].name" = ""DD02""
+				register "device[2].use_pld" = "true"
+				register "device[2].pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))"
+				# TCP1 (DP-2) unused
+				register "device[3].name" = ""DD03""
+				# TCP2 (DP-3) for port C2
+				register "device[4].name" = ""DD04""
+				register "device[4].use_pld" = "true"
+				register "device[4].pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))"
+				# TCP3 (DP-4) unused
+				register "device[5].name" = ""DD05""
 				device generic 0 on
 					probe EPS PRIVACY_SCREEN_ABSENT
 				end
 			end
-			chip drivers/gfx/generic
-				register "device_count" = "5"
-				# eDP already added, so skipped
-				# DDIB for HDMI
-				register "device[0].name" = ""DD01""
-				# TCP0 (DP-1) for port C0
-				register "device[1].name" = ""DD02""
-				register "device[1].use_pld" = "true"
-				register "device[1].pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))"
-				# TCP1 (DP-2) unused
-				register "device[2].name" = ""DD03""
-				# TCP2 (DP-3) for port C2
-				register "device[3].name" = ""DD04""
-				register "device[3].use_pld" = "true"
-				register "device[3].pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))"
-				# TCP3 (DP-4) unused
-				register "device[4].name" = ""DD05""
-				device generic 0 on end
-			end
 		end # Integrated Graphics Device
 		device ref dtt on
 			chip drivers/intel/dptf