diff --git a/src/mainboard/starlabs/starfighter/Kconfig b/src/mainboard/starlabs/starfighter/Kconfig
index 4013bb6e91..19e0161abc 100644
--- a/src/mainboard/starlabs/starfighter/Kconfig
+++ b/src/mainboard/starlabs/starfighter/Kconfig
@@ -5,6 +5,7 @@ config BOARD_STARLABS_STARFIGHTER_SERIES
 	select BOARD_ROMSIZE_KB_32768
 	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_OPTION_CFR_ENABLED
+	select DRIVERS_GFX_GENERIC
 	select DRIVERS_INTEL_PMC
 	select DRIVERS_INTEL_USB4_RETIMER
 	select DRIVERS_I2C_HID
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
index a73c4f69f2..5074917d38 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
@@ -30,11 +30,32 @@ chip soc/intel/alderlake
 
 	device domain 0 on
 		device ref igpu		on
-			register "gfx"				= "GMA_DEFAULT_PANEL(0)"
+			chip drivers/gfx/generic
+				register "device_count"		= "6"
+				# [DDIA] eDP
+				register "device[0].name"	= ""LCD0""
+				register "device[0].type"	= "panel"
+				# [DDIB] HDMI
+				register "device[1].name"	= ""DD01""
+				# [TCP0] Type-C
+				register "device[2].name"	= ""DD02""
+				register "device[2].use_pld"	= "true"
+				register "device[2].pld"	= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 0))"
+				# [TCP1] Type-C
+				register "device[3].name"	= ""DD03""
+				register "device[3].use_pld"	= "true"
+				register "device[3].pld"	= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 1))"
+				# [TCP2] N/A
+				register "device[4].name"	= ""DD04""
+				# [TCP3] N/A
+				register "device[5].name"	= ""DD05""
+				device generic 0 on end
+			end
+
 			register "ddi_portA_config"		= "1"
 			register "ddi_ports_config" = "{
-				[DDI_PORT_A]				= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
-				[DDI_PORT_B]				= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
+				[DDI_PORT_A]			= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
+				[DDI_PORT_B]			= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
 			}"
 		end
 		device ref pcie4_0	on				# SSD x4
@@ -71,13 +92,15 @@ chip soc/intel/alderlake
 					chip drivers/usb/acpi
 						register "desc" = ""Left Back USB Type-C""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group"	= "ACPI_PLD_GROUP(0, 0)"
+						register "use_custom_pld"	= "true"
+						register "custom_pld"		= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 0))"
 						device ref tcss_usb3_port1 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""Left Front USB Type-C""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group"	= "ACPI_PLD_GROUP(0, 1)"
+						register "use_custom_pld"	= "true"
+						register "custom_pld"		= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 1))"
 						device ref tcss_usb3_port2 on end
 					end
 				end
@@ -124,13 +147,15 @@ chip soc/intel/alderlake
 					chip drivers/usb/acpi
 						register "desc"		= ""Left Back USB Type-C""
 						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group"	= "ACPI_PLD_GROUP(0, 0)"
+						register "use_custom_pld" = "true"
+						register "custom_pld"	= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 0))"
 						device ref usb2_port1 on end
 					end
 					chip drivers/usb/acpi
 						register "desc"		= ""Left Front USB Type-C""
 						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group"	= "ACPI_PLD_GROUP(0, 1)"
+						register "use_custom_pld"	= "true"
+						register "custom_pld"	= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 1))"
 						device ref usb2_port2 on end
 					end
 					chip drivers/usb/acpi