From 9a8e8c605a0955ff6cac72f556183240a867a32a Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 17 Nov 2020 17:54:32 +0100 Subject: include/device/pci_ids: use the right device ID for AMD Picasso GPU The code that uses the GPU device ID uses the correct ATI vendor ID, but the description wrongly used AMD as vendor. In the AMD APUs the GPU PCI device and the corresponding audio controller use the ATI PCI vendor ID while all other PCI devices in the SoC use the AMD PCI vendor ID. Also move the two entries in a separate section right below the one they were in. Change-Id: Ia0b5bd4638f5b07c487f223321872563b36337e9 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/47674 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson --- src/include/device/pci_ids.h | 5 +++-- src/soc/amd/common/block/graphics/graphics.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 675acc4a1b..8531d04bd7 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -455,10 +455,8 @@ #define PCI_DEVICE_ID_AMD_FAM17H_GNB 0x15D0 #define PCI_DEVICE_ID_AMD_FAM17H_PCIE_GPP 0x15D3 -#define PCI_DEVICE_ID_AMD_FAM17H_GPU 0x15D8 #define PCI_DEVICE_ID_AMD_FAM17H_PCIE_GPP_BUSA 0x15DB #define PCI_DEVICE_ID_AMD_FAM17H_PCIE_GPP_BUSB 0x15DC -#define PCI_DEVICE_ID_AMD_FAM17H_HDA0 0x15DE #define PCI_DEVICE_ID_AMD_FAM17H_ACP 0x15E2 #define PCI_DEVICE_ID_AMD_FAM17H_HDA1 0x15E3 #define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI0 0x15E0 @@ -480,6 +478,9 @@ #define PCI_DEVICE_ID_AMD_FAM17H_LPC 0x790E #define PCI_DEVICE_ID_AMD_FAM17H_GBE 0x1458 +#define PCI_DEVICE_ID_ATI_FAM17H_GPU 0x15D8 +#define PCI_DEVICE_ID_ATI_FAM17H_HDA0 0x15DE + #define PCI_VENDOR_ID_VLSI 0x1004 #define PCI_DEVICE_ID_VLSI_82C592 0x0005 #define PCI_DEVICE_ID_VLSI_82C593 0x0006 diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c index 24cabfe454..d9cdd1a005 100644 --- a/src/soc/amd/common/block/graphics/graphics.c +++ b/src/soc/amd/common/block/graphics/graphics.c @@ -128,7 +128,7 @@ static const struct device_operations graphics_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_FAM17H_GPU, + PCI_DEVICE_ID_ATI_FAM17H_GPU, 0, }; -- cgit v1.2.3