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 <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47674
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 675acc4..8531d04 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 24cabfe..d9cdd1a 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 unsigned short pci_device_ids[] = {
- PCI_DEVICE_ID_AMD_FAM17H_GPU,
+ PCI_DEVICE_ID_ATI_FAM17H_GPU,
0,
};