Add more amdgpu device ids.

The marketing names in libdrm's amdgpu.ids are based on device id and
revision id.  A single device id often maps to multiple marketing names
but the same codename so stick to codenames here.  The marketing names
in amdgpu.ids also do not cover all the device ids amdgpu matches on.

Use the same codenames as amdgpu.
Polaris 20 and Polaris 30 as Polaris 10.
Polaris 21 as Polaris 11.
Polaris 22 as Vega M.

1 files changed, 73 insertions, 5 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 31e207e63e4..34535402b32 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1882 2019/04/10 13:54:06 phessler Exp $
+$OpenBSD: pcidevs,v 1.1883 2019/04/23 03:24:22 jsg Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -1087,6 +1087,7 @@ product ATI KAVERI_19		0x1318	Kaveri Radeon R5
 product ATI KAVERI_20		0x131b	Kaveri Radeon R4
 product ATI KAVERI_21		0x131c	Kaveri Radeon R7
 product ATI KAVERI_22		0x131d	Kaveri Radeon R6
+product ATI PICASSO		0x15d8	Picasso
 product ATI RAVEN_VEGA		0x15dd	Radeon Vega
 product ATI RAVEN_VEGA_HDA	0x15de	Radeon Vega HD Audio
 product ATI RADEON_HD6500D_HDA	0x1714	Radeon HD 6500D HD Audio
@@ -1438,8 +1439,8 @@ product ATI RADEON_X700PRO_R410	0x5e4b	FireGL X700 Pro
 product ATI RADEON_X700SE_R410	0x5e4c	FireGL X700 SE
 product ATI RADEON_X700_PCIE	0x5e4d	Radeon X700 PCIE
 product ATI RADEON_X700SE_PCIE	0x5e4f	Radeon X700 SE PCIE
-product ATI RADEON_X700_PCIE_S	0x5e6d	Radeon X700 PCIE Sec
 product ATI RADEON_X700_SE	0x5e4f	Radeon X700 SE
+product ATI RADEON_X700_PCIE_S	0x5e6d	Radeon X700 PCIE Sec
 product ATI RADEON_X700_SE_S	0x5e6f	Radeon X700 SE Sec
 product ATI RADEON_HD8670A	0x6600	Radeon HD 8670A
 product ATI RADEON_HD8730M	0x6601	Radeon HD 8730M
@@ -1475,6 +1476,13 @@ product ATI HAINAN_1		0x6664	Hainan
 product ATI HAINAN_2		0x6665	Hainan
 product ATI HAINAN_3		0x6667	Hainan
 product ATI RADEON_HD8500M_2	0x666f	Radeon HD 8500M
+product ATI VEGA20_1		0x66a0	Vega 20
+product ATI VEGA20_2		0x66a1	Vega 20
+product ATI VEGA20_3		0x66a2	Vega 20
+product ATI VEGA20_4		0x66a3	Vega 20
+product ATI VEGA20_5		0x66a4	Vega 20
+product ATI VEGA20_6		0x66a7	Vega 20
+product ATI VEGA20_7		0x66af	Vega 20
 product ATI CAYMAN_1		0x6700	Cayman
 product ATI CAYMAN_2		0x6701	Cayman
 product ATI CAYMAN_3		0x6702	Cayman
@@ -1561,7 +1569,27 @@ product ATI HAWAII_9		0x67b8	Hawaii
 product ATI HAWAII_10		0x67b9	Hawaii
 product ATI HAWAII_11		0x67ba	Hawaii
 product ATI HAWAII_12		0x67be	Hawaii
-product ATI RADEON_PROWX4130	0x67e8	Radeon Pro WX 4130/4150
+product ATI POLARIS10_1		0x67c0	Polaris 10
+product ATI POLARIS10_2		0x67c1	Polaris 10
+product ATI POLARIS10_3		0x67c2	Polaris 10
+product ATI POLARIS10_4		0x67c4	Polaris 10
+product ATI POLARIS10_5		0x67c7	Polaris 10
+product ATI POLARIS10_6		0x67c8	Polaris 10
+product ATI POLARIS10_7		0x67c9	Polaris 10
+product ATI POLARIS10_8		0x67ca	Polaris 10
+product ATI POLARIS10_9		0x67cc	Polaris 10
+product ATI POLARIS10_10	0x67cf	Polaris 10
+product ATI POLARIS10_11	0x67d0	Polaris 10
+product ATI POLARIS10_12	0x67df	Polaris 10
+product ATI POLARIS11_1		0x67e0	Polaris 11
+product ATI POLARIS11_2		0x67e1	Polaris 11
+product ATI POLARIS11_3		0x67e3	Polaris 11
+product ATI POLARIS11_4		0x67e7	Polaris 11
+product ATI POLARIS11_5		0x67e8	Radeon Pro WX 4130/4150
+product ATI POLARIS11_6		0x67e9	Polaris 11
+product ATI POLARIS11_7		0x67eb	Polaris 11
+product ATI POLARIS11_8		0x67ef	Polaris 11
+product ATI POLARIS11_9		0x67ff	Polaris 11
 product ATI RADEON_HD7970M	0x6800	Radeon HD 7970M
 product ATI RADEON_HD8970M	0x6801	Radeon HD 8970M
 product ATI PITCAIRN_1		0x6802	Pitcairn
@@ -1614,8 +1642,14 @@ product ATI VEGA10_4		0x6863	Vega 10
 product ATI VEGA10_5		0x6864	Vega 10
 product ATI VEGA10_6		0x6867	Vega 10
 product ATI VEGA10_7		0x6868	Vega 10
-product ATI VEGA10_8		0x687f	Radeon Rx Vega
-product ATI VEGA10_9		0x686c	Vega 10
+product ATI VEGA10_8		0x6869	Vega 10
+product ATI VEGA10_9		0x686a	Vega 10
+product ATI VEGA10_10		0x686b	Vega 10
+product ATI VEGA10_11		0x686c	Vega 10
+product ATI VEGA10_12		0x686d	Vega 10
+product ATI VEGA10_13		0x686e	Vega 10
+product ATI VEGA10_14		0x686f	Vega 10
+product ATI VEGA10_15		0x687f	Radeon Rx Vega
 product ATI CYPRESS		0x6880	Cypress
 product ATI FIREPRO_V8800	0x6888	FirePro V8800
 product ATI FIREPRO_V7800	0x6889	FirePro V7800
@@ -1659,6 +1693,37 @@ product ATI RADEON_HD7300	0x68f8	Radeon HD 7300
 product ATI RADEON_HD5450	0x68f9	Radeon HD 5450
 product ATI RADEON_HD7350	0x68fa	Radeon HD 7350
 product ATI CEDAR_LE		0x68fe	Cedar LE
+product ATI TOPAZ_1		0x6900	Topaz
+product ATI TOPAZ_2		0x6901	Topaz
+product ATI TOPAZ_3		0x6902	Topaz
+product ATI TOPAZ_4		0x6903	Topaz
+product ATI TOPAZ_5		0x6907	Topaz
+product ATI TONGA_1		0x6920	Tonga
+product ATI TONGA_2		0x6921	Tonga
+product ATI TONGA_3		0x6928	Tonga
+product ATI TONGA_4		0x6929	Tonga
+product ATI TONGA_5		0x692b	Tonga
+product ATI TONGA_6		0x692f	Tonga
+product ATI TONGA_7		0x6930	Tonga
+product ATI TONGA_8		0x6938	Tonga
+product ATI TONGA_9		0x6939	Tonga
+product ATI VEGAM_1		0x694c	Vega M
+product ATI VEGAM_2		0x694e	Vega M
+product ATI VEGAM_3		0x694f	Vega M
+product ATI POLARIS12_1		0x6980	Polaris 12
+product ATI POLARIS12_2		0x6981	Polaris 12
+product ATI POLARIS12_3		0x6985	Polaris 12
+product ATI POLARIS12_4		0x6986	Polaris 12
+product ATI POLARIS12_5		0x6987	Polaris 12
+product ATI POLARIS12_6		0x6995	Polaris 12
+product ATI POLARIS12_7		0x6997	Polaris 12
+product ATI POLARIS12_8		0x699f	Polaris 12
+product ATI VEGA12_1		0x69a0	Vega 12
+product ATI VEGA12_2		0x69a1	Vega 12
+product ATI VEGA12_3		0x69a2	Vega 12
+product ATI VEGA12_4		0x69a3	Vega 12
+product ATI VEGA12_5		0x69af	Vega 12
+product ATI POLARIS10_13	0x6fdf	Polaris 10
 product ATI RS100_PCI		0x700f	RS100 PCI
 product ATI RS200_PCI		0x7010	RS200 PCI
 product ATI RADEON_X1800A	0x7100	Radeon X1800
@@ -1765,6 +1830,8 @@ product ATI RADEON_X1650_1	0x7293	Radeon X1650
 product ATI RV560_4		0x7297	RV560
 product ATI RADEON_X1950_PRO_S	0x72a0	Radeon X1950 Pro Sec
 product ATI RADEON_RX1650_XT_2	0x72b1	Radeon RX1650 XT Sec
+product ATI FIJI_1		0x7300	Fiji
+product ATI FIJI_2		0x730f	Fiji
 product ATI RADEON_9000IGP	0x7834	Radeon 9000/9100 IGP
 product ATI RADEON_RS350IGP	0x7835	Radeon RS350IGP
 product ATI RS690_HB		0x7910	RS690 Host
@@ -1980,6 +2047,7 @@ product ATI CARRIZO_2		0x9874	Carrizo
 product ATI CARRIZO_3		0x9875	Carrizo
 product ATI CARRIZO_4		0x9876	Carrizo
 product ATI CARRIZO_5		0x9877	Carrizo
+product ATI STONEY		0x98e4	Stoney Ridge
 product ATI ARUBA_1		0x9900	Aruba
 product ATI RADEON_HD7660D	0x9901	Radeon HD 7660D
 product ATI RADEON_HD7640G_1	0x9903	Radeon HD 7640G