add "Strix Point" APU device id, and another Navi 31

150e rev c1 is Radeon 880M/890M
150e rev c4 is Radeon 880M/890M
150e rev c6 is Radeon 890M
744a rev 00 is Radeon Pro W7900 Dual Slot

found in AMD Software: Adrenalin Edition 24.7.1

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
index f710dd3..d965c21 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
@@ -209,6 +209,7 @@ static const struct pci_matchid amdgpu_devices[] = {
 
        /* GC 11.0.0, DCN 3.2.0, dGPU, "Navi 31" */
        {0x1002, 0x7448 },      /* Radeon Pro W7900 */
+       {0x1002, 0x744a },      /* Radeon Pro W7900 Dual Slot */
        {0x1002, 0x744c },      /* Radeon RX 7900 XT/XTX/GRE, 7900M */
        {0x1002, 0x745e },      /* Radeon Pro W7800 */
 
@@ -234,9 +235,13 @@ static const struct pci_matchid amdgpu_devices[] = {
        /* GC 11.0.4, DCN 3.1.4, APU, Ryzen 8040, "Hawk Point" */
        {0x1002, 0x1901 },      /* Radeon 740M */
 
-       /* GC 11.5.0, DCN 3.5.0, APU, linux >= 6.7 */
-       /* GC 11.5.1, DCN 3.5.1, APU, linux >= 6.9 */
+#ifdef notyet
+       /* GC 11.5.0, DCN 3.5.0, APU, Ryzen AI 300, "Strix Point", linux 6.7 */
+       {0x1002, 0x150e },      /* Radeon 880M / 890M */
 
-       /* GC 12.0.0, DCN 4.0.1, dGPU, linux ?, amd-staging-drm-next */
-       /* GC 12.0.1, DCN 4.0.1, dGPU, linux ?, amd-staging-drm-next */
+       /* GC 11.5.1, DCN 3.5.1, APU, linux 6.9 */
+
+       /* GC 12.0.0, DCN 4.0.1, dGPU, linux 6.11 */
+       /* GC 12.0.1, DCN 4.0.1, dGPU, linux 6.11 */
+#endif
 };

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index a4484d3..f0f0993 100644 (file)
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.2079 2024/07/02 22:28:02 kettenis Exp $
+$OpenBSD: pcidevs,v 1.2080 2024/07/29 01:17:53 jsg Exp $
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
 
 /*
@@ -1327,6 +1327,7 @@ product ATI CYAN_SKILLFISH_2      0x143f  Cyan Skillfish
 product ATI PPB_1              0x1478  PCIE
 product ATI PPB_2              0x1479  PCIE
 product ATI MENDOCINO          0x1506  Mendocino
+product ATI STRIX_POINT                0x150e  Strix Point
 product ATI PHOENIX_1          0x15bf  Phoenix
 product ATI PHOENIX_2          0x15c8  Phoenix
 product ATI PICASSO            0x15d8  Picasso
@@ -2149,6 +2150,7 @@ 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_4           0x744a  Navi 31
 product ATI NAVI31_1           0x744c  Navi 31
 product ATI NAVI31_3           0x745e  Navi 31
 product ATI NAVI32_1           0x7470  Navi 32