erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mb/google/brya/var/nissa: Remove duplicate ACPI device GFX0

Browse source 
Per discussion in CB:87660, this is another approach to fix duplicate
ACPI device GFX0.

The following GFX ACPI device is already declared in nissa/devicetree
by CB:83071, it declare a ACPI gfx device as below:

	device ref igpu on
		register "panel_cfg" = "{
		    .up_delay_ms = 200,
		    .down_delay_ms = 50,
		    .cycle_delay_ms = 500,
		    .backlight_on_delay_ms = 1,
		    .backlight_off_delay_ms = 200,
		    .backlight_pwm_hz = 200,
		}"
		register "gfx" = "GMA_DEFAULT_PANEL(0)"
	end

It will generate an ACPI \_SB.PCI0.GFX0 device.

However, some Nissa projects re-select DRIVERS_GFX_GENERIC in their
overridetree, which results in the generation of a second
\_SB.PCI0.GFX0. This duplication causes iasl to fail when disassembling
the SSDT table.

Error message from iasl:

	File appears to be binary: found 7485 non-ASCII characters, disassembling
	Binary file appears to be a valid ACPI table, disassembling
	Input file SSDT, Length 0x4A03 (18947) bytes
	ACPI: SSDT 0x0000000000000000 004A03 (v02 COREv4 COREBOOT 00000000 CORE 20230628)
	Pass 1 parse of [SSDT]
	Firmware Error (ACPI): Failure creating named object [\_SB.PCI0.GFX0._DOD], AE_ALREADY_EXISTS (20200925/dswload-387)
	ACPI Error: AE_ALREADY_EXISTS, During name lookup/catalog (20200925/psobject-264)
	Could not parse ACPI tables, AE_ALREADY_EXISTS

BUG=none
TEST=disassembling SSDT on pujjoniru successfully

Change-Id: I16e9875c12b4e8e42214da5972bed6a02c5567f4
Signed-off-by: Simon Yang <simon1.yang@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/87745
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <ericllai@google.com>
This commit is contained in:
Simon Yang 2025-05-19 17:53:33 +08:00 • committed by Matt DeVillier
commit 743e3a07f5
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/mainboard/google/brya/Kconfig
View file

@ -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

6
src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb
View file

@ -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