From a7659ebe4e1101a7a2cbe1f156943e83e9f59249 Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Tue, 16 Mar 2021 13:20:23 -0600 Subject: [PATCH] soc/amd/common/block/graphics: Don't add VBIOS to cbmem when using GOP pci_rom_ssdt reloads the oprom from cbfs. It then places it into cbmem and writes the offsets as the ROM ACPI node. The GOP driver modifies the VBIOS so we don't want to reread from cbfs. When using GOP we also pass the offsets with the VFCT table. Signed-off-by: Raul E Rangel Change-Id: Iaf53e750564f1f0e115cd354790da62e672d74b7 Reviewed-on: https://review.coreboot.org/c/coreboot/+/51541 Tested-by: build bot (Jenkins) Reviewed-by: Nikolai Vyssotski Reviewed-by: Martin Roth --- src/soc/amd/common/block/graphics/graphics.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c index 82b437b155..071dfcc7c5 100644 --- a/src/soc/amd/common/block/graphics/graphics.c +++ b/src/soc/amd/common/block/graphics/graphics.c @@ -108,7 +108,11 @@ static void generate_atif(const struct device *dev) static void graphics_fill_ssdt(const struct device *dev) { acpi_device_write_pci_dev(dev); - pci_rom_ssdt(dev); + + /* Use the VFCT copy when using GOP */ + if (!CONFIG(RUN_FSP_GOP)) + pci_rom_ssdt(dev); + if (CONFIG(SOC_AMD_COMMON_BLOCK_GRAPHICS_ATIF)) generate_atif(dev); }