From c12c403d3e50e5a8ce261b08a062f97863635fbd Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Wed, 6 Mar 2024 07:01:24 +0000
Subject: [PATCH] add AMD Instinct MI300 device ids

---
 sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h | 15 ++++++++++-----
 sys/dev/pci/pcidevs                         |  4 +++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
index bd0b1696c69..81832353acc 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
@@ -141,10 +141,6 @@ static const struct pci_matchid amdgpu_devices[] = {
 	{0x1002, 0x73AF },
 	{0x1002, 0x73BF },
 
-	/* Van Gogh */
-	{0x1002, 0x1435 },	/* Custom GPU 0932 */
-	{0x1002, 0x163F },	/* Custom GPU 0405 */
-
 	/* Yellow Carp */
 	{0x1002, 0x164D },
 	{0x1002, 0x1681 },
@@ -197,6 +193,14 @@ static const struct pci_matchid amdgpu_devices[] = {
 	 * display/dc/core/dc_resource.c resource_parse_asic_id()
 	 */
 
+	/* GC 9.4.3, APU/dGPU, "Aqua Vanjaram" */
+	{0x1002, 0x74a0 },	/* Instinct MI300A APU */
+	{0x1002, 0x74a1 },	/* Instinct MI300X dGPU */
+
+	/* GC 10.3.1, DCN 3.0.1, APU, "Van Gogh" */
+	{0x1002, 0x1435 },	/* Custom GPU 0932 */
+	{0x1002, 0x163f },	/* Custom GPU 0405 */
+
 	/* GC 10.3.6, DCN 3.1.5, APU, Ryzen 7000 "Raphael" */
 	{0x1002, 0x164e },	/* Radeon 610M */
 
@@ -213,7 +217,7 @@ static const struct pci_matchid amdgpu_devices[] = {
 
 	/* GC 11.0.2, DCN 3.2.1, dGPU, "Navi 33" */
 	{0x1002, 0x7480 },	/* Radeon RX 7600S, 7700S, 7600M XT,
-				   7600, Pro W7600 */
+				   7600, 7600 XT, Pro W7600 */
 	{0x1002, 0x7483 },	/* Radeon RX 7600M */
 	{0x1002, 0x7489 },	/* Radeon Pro W7500 */
 
@@ -225,4 +229,5 @@ static const struct pci_matchid amdgpu_devices[] = {
 	{0x1002, 0x15c8 },	/* Radeon 740M */
 
 	/* GC 11.5.0, DCN 3.5.0, APU, linux >= 6.7 */
+	/* GC 11.5.1, DCN 3.5.0, APU, linux >= 6.9 */
 };
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index f7c92aa24f4..db116dbcb53 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.2067 2024/03/06 00:05:18 jsg Exp $
+$OpenBSD: pcidevs,v 1.2068 2024/03/06 07:01:24 jsg Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -2151,6 +2151,8 @@ product ATI NAVI32_2		0x747e	Navi 32
 product ATI NAVI33_1		0x7480	Navi 33
 product ATI NAVI33_2		0x7483	Navi 33
 product ATI NAVI33_3		0x7489	Navi 33
+product ATI MI300A		0x74a0	MI300A
+product ATI MI300X		0x74a1	MI300X
 product ATI RADEON_9000IGP	0x7834	Radeon 9000/9100 IGP
 product ATI RADEON_RS350IGP	0x7835	Radeon RS350IGP
 product ATI RS690_HB		0x7910	RS690 Host
-- 
2.20.1