diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 354d122465..59895cc839 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -91,6 +91,7 @@ config BOARD_GOOGLE_BASEBOARD_NISSA
 	select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768
 	select CHROMEOS_DRAM_PART_NUMBER_IN_CBI if CHROMEOS
 	select DRIVERS_AUDIO_SOF
+	select DRIVERS_GFX_GENERIC
 	select DRIVERS_INTEL_ISH
 	select FSP_TYPE_IOT if !CHROMEOS
 	select MAINBOARD_DISABLE_STAGE_CACHE
@@ -109,6 +110,7 @@ config BOARD_GOOGLE_BASEBOARD_TRULO
 	select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768
 	select CHROMEOS_DRAM_PART_NUMBER_IN_CBI if CHROMEOS
 	select DRIVERS_AUDIO_SOF
+	select DRIVERS_GFX_GENERIC
 	select DRIVERS_INTEL_ISH
 	select DRIVER_INTEL_ISH_HAS_MAIN_FW
 	select MAINBOARD_DISABLE_STAGE_CACHE
@@ -152,7 +154,6 @@ config BOARD_GOOGLE_ANRAGGAR
 	select BOARD_ROMSIZE_KB_16384
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_GPIO_KEYS
-	select DRIVERS_GFX_GENERIC
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select HAVE_WWAN_POWER_SEQUENCE
 	select INTEL_GMA_HAVE_VBT
@@ -508,7 +509,6 @@ config BOARD_GOOGLE_PUJJONIRU
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_GPIO_KEYS
-	select DRIVERS_GFX_GENERIC
 	select DRIVERS_AUDIO_SOF
 	select ENFORCE_MEM_CHANNEL_DISABLE
 	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
@@ -579,7 +579,6 @@ config BOARD_GOOGLE_RULL
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_GPIO_KEYS
-	select DRIVERS_GFX_GENERIC
 	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 	select SOC_INTEL_TWINLAKE
 
@@ -638,7 +637,6 @@ config BOARD_GOOGLE_TELIKS
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_GPIO_KEYS
-	select DRIVERS_GFX_GENERIC
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select HAVE_WWAN_POWER_SEQUENCE
 	select SOC_INTEL_TWINLAKE
@@ -650,7 +648,6 @@ config BOARD_GOOGLE_TELITH
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_GPIO_KEYS
-	select DRIVERS_GFX_GENERIC
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 	select SOC_INTEL_TWINLAKE
diff --git a/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb
index 8b1cebd1a5..2804818261 100644
--- a/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb
+++ b/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb
@@ -189,7 +189,11 @@ chip soc/intel/alderlake
 			    .backlight_off_delay_ms = 200,
 			    .backlight_pwm_hz = 200,
 			}"
-			register "gfx" = "GMA_DEFAULT_PANEL(0)"
+			chip drivers/gfx/generic
+				register "device_count" = "1"
+				register "device[0].name" = ""LCD0""
+				device generic 0 on end
+			end
 		end
 		device ref dtt on end
 		device ref gna on end