From 6583135192207ac05502794cfb5bd5b1028feb54 Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@cvs.openbsd.org>
Date: Mon, 12 Jun 2023 01:12:34 +0000
Subject: add more Navi 31 device ids

Radeon Pro W7800 and Radeon Pro W7900
from Radeon Software for Linux 23.10.1 (5.5.1) libdrm-amdgpu-common
---
 sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h | 10 ++++++----
 sys/dev/pci/pcidevs                         |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
index a1ee77ae949..821f25cc67b 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
@@ -202,15 +202,17 @@ static const struct pci_matchid amdgpu_devices[] = {
 	/* GC 10.3.7, DCN 3.1.6, APU, Ryzen 7020 "Mendocino" */
 	{0x1002, 0x1506 },
 
-	/* GC 11.0.0, DCN 3.2.0, dGPU, Radeon RX 7900 XT/XTX "Navi 31" */
-	{0x1002, 0x744c },
+	/* GC 11.0.0, DCN 3.2.0, dGPU, "Navi 31" */
+	{0x1002, 0x744c },	/* Radeon RX 7900 XT/XTX */
+	{0x1002, 0x7448 },	/* Radeon Pro W7900 */
+	{0x1002, 0x745e },	/* Radeon Pro W7800 */
 
 	/* GC 11.0.1, DCN 3.1.4, APU, Ryzen 7040 "Phoenix" */
 	{0x1002, 0x15bf },
 
 	/* GC 11.0.2, DCN 3.2.1, dGPU, "Navi 33" */
-	{0x1002, 0x7480 },
-	{0x1002, 0x7483 },
+	{0x1002, 0x7480 },	/* Radeon RX 7600S, 7700S, 7600M XT, 7600 */
+	{0x1002, 0x7483 },	/* Radeon RX 7600M */
 
 	/* GC 11.0.3, DCN 3.2.0, dGPU */
 	/* GC 11.0.4, DCN 3.1.4, APU */
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 8f486074838..87726e0fcf9 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.2037 2023/05/22 13:23:56 denis Exp $
+$OpenBSD: pcidevs,v 1.2038 2023/06/12 01:12:33 jsg Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -2097,7 +2097,9 @@ product ATI BEIGE_GOBY_3	0x7422	Navi 24
 product ATI BEIGE_GOBY_4	0x7423	Navi 24
 product ATI BEIGE_GOBY_5	0x7424	Navi 24
 product ATI BEIGE_GOBY_6	0x743f	Navi 24
+product ATI NAVI31_2		0x7448	Navi 31
 product ATI NAVI31_1		0x744c	Navi 31
+product ATI NAVI31_3		0x745e	Navi 31
 product ATI NAVI33_1		0x7480	Navi 33
 product ATI NAVI33_2		0x7483	Navi 33
 product ATI RADEON_9000IGP	0x7834	Radeon 9000/9100 IGP
-- 
cgit v1.2.3