mb/google/brya/var/redrix: Use just single GFX entry

Since multiple GFX entry causes an ACPI error when trying to write _DOD
method multiple times, combine the GFX entry into one so that _DOD
method is written just once.

BUG=b:289854155
TEST=emerge-brya coreboot

Signed-off-by: Won Chung <wonchung@google.com>
Change-Id: I22ad70d50f1aecf8da70e8dd04a36a0a7c1c7609
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76329
Reviewed-by: Subrata Banik <subratabanik@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-by: Tarun Tuli <taruntuli@google.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
This commit is contained in:
Won Chung 2023-07-06 16:49:50 +00:00 committed by Subrata Banik
parent 95a5e72213
commit 2c06ef9f8c
2 changed files with 60 additions and 42 deletions

View File

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

View File

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