Pull in all the pcidev discrepancies from drm_pciids.h in dev/pci (which

is soon to die).

"lovely" deraadt@, ok brad@. Both also helped with suggestions.

1 files changed, 279 insertions, 77 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index accdad14d8b..6fb7071e3ce 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1435 2008/11/18 23:26:38 brad Exp $
+$OpenBSD: pcidevs,v 1.1436 2008/11/22 04:15:06 oga Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -420,8 +420,12 @@ product 3COM 3C990BSVR		0x990a	3c990BSVR
 product 3DFX VOODOO		0x0001	Voodoo
 product 3DFX VOODOO2		0x0002	Voodoo2
 product 3DFX BANSHEE		0x0003	Banshee
+product 3DFX VOODOO32000	0x0004	Voodoo3
 product 3DFX VOODOO3		0x0005	Voodoo3
+product 3DFX VOODOO4		0x0007	Voodoo4
 product 3DFX VOODOO5		0x0009	Voodoo5
+product 3DFX VOODOO44200	0x000b	Voodoo4
+
 
 /* 3D Labs products */
 product 3DLABS 300SX		0x0001	300SX
@@ -835,22 +839,38 @@ product ASIX AX88140A		0x1400	AX88140A/88141
 product ASUSTEK HFCPCI		0x0675	ISDN
 
 /* ATI Technologies */
-product ATI RADEON_M241P	0x3150	Radeon Mobility X600
-product ATI FIREGL_V3200	0x3154	FireGL V3200
-product ATI RADEON_X600_RV380	0x3e50	Radeon X600 (RV380)
-product ATI RADEON_X600_RV380_S	0x3e70	Radeon X600 (RV380) Sec
+product ATI RADEON_M241P	0x3150	Radeon M241P
+product ATI RADEON_X300M24	0x3150	Radeon X300 M24
+product ATI FIREGL_M24GL	0x3154	FireGL M24 GL
+product ATI RADEON_X600_RV380	0x3e50	Radeon X600
+product ATI FIREGL_V3200	0x3e54	FireGL V3200
+product ATI RADEON_X600_RV380_S	0x3e70	Radeon X600 Sec
+product ATI RADEON_IGP320	0x4136	Radeon IGP 320
+product ATI RADEON_IGP340	0x4137	Radeon IGP 340
 product ATI RADEON_9500PRO	0x4144	Radeon 9500 Pro
+product ATI RADEON_AE9700PRO	0x4145	Radeon AE 9700 Pro
+product ATI RADEON_AF9600TX	0x4146	Radeon AF 9600TX
+product ATI FIREGL_AGZ1		0x4147	FireGL AGZ1
+product ATI RADEON_AH_9800SE	0x4148	Radeon AH 9800 SE
+product ATI RADEON_AI_9800	0x4149	Radeon AI 9800
+product ATI RADEON_AJ_9800	0x414a	Radeon AJ 9800
+product ATI FIREGL_AKX2		0x414b	FireGL AK X2
 product ATI RADEON_9600PRO	0x4150	Radeon 9600 Pro
-product ATI RADEON_9600LE	0x4151	Radeon 9600 LE
-product ATI RADEON_9600XT	0x4152	Radeon 9600 XT
+product ATI RADEON_9600LE	0x4151	Radeon 9600
+product ATI RADEON_9600XT	0x4152	Radeon 9600
 product ATI RADEON_9550		0x4153	Radeon 9550
+product ATI FIREGL_ATT2		0x4154	FireGL
+product ATI RADEON_9650		0x4155	Radeon 9650
+product ATI FIREGL_AVT2		0x4156	FireGL
 product ATI MACH32		0x4158	Mach32
 product ATI RADEON_9500PRO_S	0x4164	Radeon 9500 Pro Sec
 product ATI RADEON_9600PRO_S	0x4170	Radeon 9600 Pro Sec
 product ATI RADEON_9600LE_S	0x4171	Radeon 9600 LE Sec
 product ATI RADEON_9600XT_S	0x4172	Radeon 9600 XT Sec
 product ATI RADEON_9550_S	0x4173	Radeon 9550 Sec
-product ATI R200_BB		0x4242	Radeon 8500 BB
+product ATI RADEON_IGP_RS250	0x4237	Radeon IGP
+product ATI R200_BB		0x4242	Radeon 8500
+product ATI R200_BC		0x4243	Radeon BC R200 
 product ATI RADEON_IGP320M	0x4336	Radeon IGP 320M
 product ATI MOBILITY_M6		0x4337	Mobility M6
 product ATI SB200_AUDIO		0x4341	SB200 AC97
@@ -914,96 +934,163 @@ product ATI SB700_OHCI_4	0x439a	SB700 USB
 product ATI SB700_OHCI_5	0x439b	SB700 USB
 product ATI SB700_IDE		0x439c	SB700 IDE
 product ATI SB700_ISA		0x439d	SB700 ISA
+product ATI RADEON_MIGP_RS250	0x4437	Radeon Mobility IGP
 product ATI MACH64_ET		0x4554	Mach64 ET
 product ATI RAGEPRO		0x4742	Rage Pro
-product ATI MACH64_GD		0x4744	Mach64 GD
-product ATI MACH64_GI		0x4749	Mach64 GI
-product ATI MACH64_GL		0x474c	Mach64 GL
-product ATI MACH64_GM		0x474d	Mach64 GM
-product ATI MACH64_GN		0x474e	Mach64 GN
-product ATI MACH64_GO		0x474f	Mach64 GO
-product ATI MACH64_GP		0x4750	Mach64 GP
-product ATI MACH64_GQ		0x4751	Mach64 GQ
+product ATI MACH64_GD		0x4744	Mach64
+product ATI MACH64_GI		0x4749	Mach64
+product ATI MACH64_GL		0x474c	Mach64
+product ATI MACH64_GM		0x474d	Mach64
+product ATI MACH64_GN		0x474e	Mach64
+product ATI MACH64_GO		0x474f	Mach64
+product ATI MACH64_GP		0x4750	Mach64
+product ATI MACH64_GQ		0x4751	Mach64
 product ATI RAGEXL		0x4752	Rage XL
-product ATI MACH64_GS		0x4753	Mach64 GS
-product ATI MACH64_GT		0x4754	Mach64 GT
-product ATI MACH64_GU		0x4755	Mach64 GU
-product ATI MACH64_GV		0x4756	Mach64 GV
-product ATI MACH64_GW		0x4757	Mach64 GW
-product ATI MACH64_GX		0x4758	Mach64 GX
-product ATI MACH64_GY		0x4759	Mach64 GY
-product ATI MACH64_GZ		0x475a	Mach64 GZ
+product ATI MACH64_GS		0x4753	Mach64
+product ATI MACH64_GT		0x4754	Mach64
+product ATI MACH64_GU		0x4755	Mach64
+product ATI MACH64_GV		0x4756	Mach64
+product ATI MACH64_GW		0x4757	Mach64
+product ATI MACH64_GX		0x4758	Mach64
+product ATI MACH64_GY		0x4759	Mach64
+product ATI MACH64_GZ		0x475a	Mach64
 product ATI RV250		0x4966	Radeon 9000
+product ATI RADEON_IG9000	0x4966	Radeon 9000
 product ATI RV250_S		0x496e	Radeon 9000 Sec
+product ATI RADEON_JHX800	0x4a48	Radeon X800
 product ATI RADEON_X800PRO	0x4a49	Radeon X800 Pro
+product ATI RADEON_X800SE	0x4a4a	Radeon X800SE
+product ATI RADEON_X800XT	0x4a4b	Radeon X800XT
+product ATI RADEON_X800		0x4a4c	Radeon X800
+product ATI FIREGL_X3256	0x4a4d	FireGL X3-256
+product ATI MOBILITY_M18	0x4a4e	Radeon Mobility M18
+product ATI RADEON_JOX800SE	0x4a4f	Radeon X800 SE
+product ATI RADEON_X800XTPE	0x4a50	Radeon X800 XT
+product ATI RADEON_AIW_X800VE	0x4a54	Radeon AIW X800 VE
 product ATI RADEON_X800PRO_S	0x4a69	Radeon X800 Pro Sec
-product ATI MACH64_LB		0x4c42	Mach64 LB
-product ATI MACH64_LD		0x4c44	Mach64 LD
-product ATI RAGE128_LE		0x4c45	Rage128 LE
+product ATI RADEON_X850XT	0x4b49	Radeon X850 XT
+product ATI RADEON_X850SE	0x4b4a	Radeon X850 SE
+product ATI RADEON_X850PRO	0x4b4b	Radeon X850 Pro
+product ATI RADEON_X850XTPE	0x4b4c	Radeon X850 XT PE 
+product ATI MACH64_LB		0x4c42	Mach64
+product ATI MACH64_LD		0x4c44	Mach64
+product ATI RAGE128_LE		0x4c45	Rage128
 product ATI MOBILITY_M3		0x4c46	Mobility M3
-product ATI MACH64_LG		0x4c47	Mach64 LG
-product ATI MACH64_LI		0x4c49	Mach64 LI
+product ATI MACH64_LG		0x4c47	Mach64
+product ATI MACH64_LI		0x4c49	Mach64
 product ATI MOBILITY_1		0x4c4d	Mobility 1
-product ATI MACH64_LN		0x4c4e	Mach64 LN
-product ATI MACH64_LP		0x4c50	Mach64 LP
-product ATI MACH64_LQ		0x4c51	Mach64 LQ
+product ATI MACH64_LN		0x4c4e	Mach64
+product ATI MACH64_LP		0x4c50	Mach64
+product ATI MACH64_LQ		0x4c51	Mach64
 product ATI RAGE_PM		0x4c52	Rage P/M
-product ATI MACH64LS		0x4c53	Mach64 LS
-product ATI RADEON_M7LW		0x4c57	Radeon Mobility M7 LW
-product ATI RADEON_M6LY		0x4c59	Radeon Mobility M6 LY
-product ATI RADEON_M6LZ		0x4c5a	Radeon Mobility M6 LZ
-product ATI RADEON_M9Lf		0x4c66	Radeon Mobility M9 Lf
-product ATI RAGE128_MF		0x4d46	Rage 128 Mobility MF
-product ATI RAGE128_ML		0x4d4c	Rage 128 Mobility ML
+product ATI MACH64LS		0x4c53	Mach64
+product ATI RADEON_M7LW		0x4c57	Radeon Mobility M7
+product ATI FIREGL_M7		0x4c58	FireGL Mobility 7800 M7
+product ATI RADEON_M6LY		0x4c59	Radeon Mobility M6
+product ATI RADEON_M6LZ		0x4c5a	Radeon Mobility M6
+product ATI RADEON_M9LD		0x4c64	Radeon Mobility M9
+product ATI RADEON_M9Lf		0x4c66	Radeon Mobility M9
+product ATI RADEON_M9Lg		0x4c66	Radeon Mobility M9
+product ATI RAGE128_MF		0x4d46	Rage 128 Mobility
+product ATI RAGE128_ML		0x4d4c	Rage 128 Mobility
 product ATI R300		0x4e44	Radeon 9500/9700
 product ATI RADEON9500_PRO	0x4e45	Radeon 9500 Pro
-product ATI RADEON_9800XT	0x4e4a	Radeon 9800 XT
+product ATI RADEON9600TX	0x4e46	Radeon 9600 TX
+product ATI FIREGL_X1		0x4e47	FireGL X1
 product ATI R350		0x4e48	Radeon 9800 Pro
-product ATI RV350		0x4e50	Radeon Mobility M10 NP
-product ATI RV350_WS		0x4e54	Radeon Mobility M10 NT
+product ATI RADEON9800		0x4e49	RAdeon 9800
+product ATI RADEON_9800XT	0x4e4a	Radeon 9800 XT
+product ATI FIREGL_X2		0x4e4b	FireGL X2
+product ATI RV350		0x4e50	Radeon Mobility M10
+product ATI RV350NQ		0x4e51	Radeon Mobility M10
+product ATI RV350NR		0x4e52	Radeon Mobility M10
+product ATI RV350NS		0x4e53	Radeon Mobility M10
+product ATI RV350_WS		0x4e54	Radeon Mobility M10
+product ATI MOBILITY_9550	0x4e56	Radeon Mobility 9550
 product ATI R300_S		0x4e64	Radeon 9500/9700 Sec
 product ATI R350_S		0x4e68	Radeon 9800 Pro Sec
-product ATI RAGE128_PD		0x5044	Rage 128 Pro PD
+product ATI RAGE128_PA		0x5041	Rage 128 Pro
+product ATI RAGE128_PB		0x5042	Rage 128 Pro
+product ATI RAGE128_PC		0x5043	Rage 128 Pro
+product ATI RAGE128_PD		0x5044	Rage 128 Pro
+product ATI RAGE128_PE		0x5045	Rage 128 Pro
 product ATI RAGE_FURY		0x5046	Rage Fury
-product ATI RAGE128_PK		0x5052	Rage 128 PK
+product ATI RAGE128_PG		0x5047	Rage 128
+product ATI RAGE128_PH		0x5048	Rage 128
+product ATI RAGE128_PI		0x5049	Rage 128
+product ATI RAGE128_PJ		0x504a	Rage 128
+product ATI RAGE128_PK		0x504b	Rage 128
+product ATI RAGE128_PL		0x504c	Rage 128
+product ATI RAGE128_PM		0x504d	Rage 128
+product ATI RAGE128_PN		0x504e	Rage 128
+product ATI RAGE128_PO		0x504f	Rage 128
+product ATI RAGE128_PP		0x5050	Rage 128
+product ATI RAGE128_PQ		0x5051	Rage 128
+product ATI RAGE128_PR		0x5052	Rage 128
+product ATI RAGE128_PS		0x5053	Rage 128
+product ATI RAGE128_PT		0x5054	Rage 128
+product ATI RAGE128_PU		0x5055	Rage 128
+product ATI RAGE128_PV		0x5056	Rage 128
+product ATI RAGE128_PW		0x5057	Rage 128
+product ATI RAGE128_PX		0x5058	Rage 128 PX
 product ATI RADEON_AIW		0x5144	AIW Radeon
-product ATI RADEON_QE		0x5145	Radeon QE
-product ATI RADEON_QF		0x5146	Radeon QF
-product ATI RADEON_QG		0x5147	Radeon QG
-product ATI R200_QL		0x514c	Radeon 8500 QL
-product ATI R200_QM		0x514d	Radeon 9100 QM
-product ATI R200_QN		0x514e	Radeon 8500 QN
-product ATI R200_QO		0x514f	Radeon 8500 QO
-product ATI RV200_QW		0x5157	Radeon 7500 QW
-product ATI RADEON_QY		0x5159	Radeon VE QY
-product ATI RADEON_QZ		0x515a	Radeon VE QZ
+product ATI RADEON_QE		0x5145	Radeon
+product ATI RADEON_QF		0x5146	Radeon
+product ATI RADEON_QG		0x5147	Radeon
+product ATI RADEON_QH		0x5148	Radeon
+product ATI R200_QL		0x514c	Radeon 8500
+product ATI R200_QM		0x514d	Radeon 9100
+product ATI R200_QN		0x514e	Radeon 8500
+product ATI R200_QO		0x514f	Radeon 8500
+product ATI RV200_QW		0x5157	Radeon 7500
+product ATI RV200_QX		0x5158	Radeon 7500
+product ATI RADEON_QY		0x5159	Radeon VE 
+product ATI RADEON_QZ		0x515a	Radeon VE
 product ATI ES1000		0x515e	ES1000
-product ATI R200_Ql		0x516c	Radeon 8500 Ql
-product ATI RAGE128_GL		0x5245	Rage 128 GL
+product ATI R200_Ql		0x516c	Radeon 8500
+product ATI RAGE128_GL		0x5245	Rage 128
 product ATI RAGE_MAGNUM		0x5246	Rage Magnum
-product ATI RAGE128_RG		0x5247	Rage 128 RG
-product ATI RAGE128_RK		0x524b	Rage 128 RK
-product ATI RAGE128_VR		0x524c	Rage 128 VR
-product ATI RAGE128_SH		0x5348	Rage 128 SH
-product ATI RAGE128_SK		0x534b	Rage 128 SK
-product ATI RAGE128_SL		0x534c	Rage 128 SL
-product ATI RAGE128_SM		0x534d	Rage 128 SM
+product ATI RAGE128_RG		0x5247	Rage 128
+product ATI RAGE128_RK		0x524b	Rage 128
+product ATI RAGE128_VR		0x524c	Rage 128
+product ATI RAGE128_SH		0x5348	Rage 128
+product ATI RAGE128_SK		0x534b	Rage 128
+product ATI RAGE128_SL		0x534c	Rage 128
+product ATI RAGE128_SM		0x534d	Rage 128
 product ATI RAGE128		0x534e	Rage 128
-product ATI RAGE128_TF		0x5446	Rage 128 Pro TF
-product ATI RAGE128_TL		0x544c	Rage 128 Pro TL
-product ATI RAGE128_TR		0x5452	Rage 128 Pro TR
+product ATI RAGE128_TF		0x5446	Rage 128 Pro
+product ATI RAGE128_TL		0x544c	Rage 128 Pro
+product ATI RAGE128_TR		0x5452	Rage 128 Pro
 product ATI RADEON_M300_M22	0x5460	Radeon Mobility M300 M22
-product ATI RADEON_X800_RV430	0x554d	Radeon X800 (RV430)
-product ATI RADEON_X800_RV430_S	0x556d	Radeon X800 (RV430) Sec
+product ATI RADEON_X600_M24C	0x5462	Radeon Mobility X600 M24C
+product ATI FIREGL_M44		0x5464	FireGL M44 GL 5464
+product ATI RADEON_X800_RV423	0x5548	Radeon X800 
+product ATI RADEON_X800PRORV423	0x5549	Radeon X800 Pro
+product ATI RADEON_X800XT_RV423	0x554a	Radeon X800 XT PE
+product ATI RADEON_X800SE_RV423	0x554b	Radeon X800 SE
+product ATI RADEON_X800XTPRV430	0x554c	Radeon X800 XTP
+product ATI RADEON_X800XL_RV430	0x554d	Radeon X800 XL
+product ATI RADEON_X800SE_RV430	0x554e	Radeon X800 SE
+product ATI RADEON_X800_RV430	0x554f	Radeon X800
+product ATI FIREGL_V7100_RV423	0x5550	FireGL V7100
+product ATI FIREGL_V5100_RV423	0x5551	FireGL V5100
+product ATI FIREGL_UR_RV423	0x5552	FireGL
+product ATI FIREGL_UT_RV423	0x5553	FireGL
+product ATI RADEON_X800_RV430_S	0x556d	Radeon X800 Sec
+product ATI FIREGL_V5000_M26	0x564a	Mobility FireGL V5000 M26
+product ATI FIREGL_V5000_M26b	0x564b	Mobility FireGL V5000 M26
+product ATI RADEON_X700XL_M26	0x564f	Radeon Mobility X700 XL M26
 product ATI RADEON_X700_M26_1	0x5652	Radeon Mobility X700 M26
 product ATI RADEON_X700_M26_2	0x5653	Radeon Mobility X700 M26
-product ATI MACH64_VT		0x5654	Mach64 VT
-product ATI MACH64_VU		0x5655	Mach64 VU
-product ATI MACH64_VV		0x5656	Mach64 VV
+product ATI MACH64_VT		0x5654	Mach64
+product ATI MACH64_VU		0x5655	Mach64
+product ATI MACH64_VV		0x5656	Mach64
+product ATI RADEON_X550XTX	0x5657	Radeon X550XTX
 product ATI RS300_100_HB	0x5830	RS300_100 Host
 product ATI RS300_133_HB	0x5831	RS300_133 Host
 product ATI RS300_166_HB	0x5832	RS300_166 Host
 product ATI RADEON_IGP9100_HB	0x5833	Radeon IGP 9100 Host
+product ATI RADEON_IGP9100_IGP	0x5834	Radeon IGP 9100 
 product ATI RADEON_IGP9100	0x5835	Radeon Mobility IGP 9100
 product ATI RADEON_IGP9100_AGP	0x5838	Radeon IGP 9100 AGP
 product ATI RADEON_RV280_PRO_S	0x5940	Radeon 9200 PRO Sec
@@ -1019,6 +1106,8 @@ product ATI RADEON_RV280_PRO	0x5960	Radeon 9200 PRO
 product ATI RADEON_RV280	0x5961	Radeon 9200
 product ATI RADEON_RV280_B	0x5962	Radeon 9200
 product ATI RADEON_RV280_SE_S	0x5964	Radeon 9200 SE Sec
+product ATI FIREMV_2200		0x5965	FireMV 2200
+product ATI ES1000_1		0x5969	ES1000
 product ATI RADEON_RS482	0x5974	Radeon XPRESS 200
 product ATI RADEON_RS482_B	0x5975	Radeon XPRESS 200M
 product ATI RD790_PCIE_1	0x5978	RD790 PCIE
@@ -1039,42 +1128,141 @@ product ATI RADEON_X300		0x5b60	Radeon X300
 product ATI RADEON_X600_RV370	0x5b62	Radeon X600 (RV370)
 product ATI RADEON_X550		0x5b63	Radeon X550
 product ATI FIREGL_RV370	0x5b64	FireGL V3100
+product ATI FIREMV_2200_5B65	0x5b64	FireMV 2200 5B65
 product ATI RADEON_X300_S	0x5b70	Radeon X300 Sec
-product ATI RADEON_X600_RV370_S	0x5b72	Radeon X600 (RV370) Sec
+product ATI RADEON_X600_RV370_S	0x5b72	Radeon X600 Sec
 product ATI RADEON_X550_S	0x5b73	Radeon X550 Sec
 product ATI FIREGL_RV370_S	0x5b74	FireGL V3100 Sec
 product ATI RADEON_RV280_M	0x5c61	Radeon Mobility 9200
-product ATI RADEON_M9PLUS	0x5c63	Radeon Mobility 9200 (M9+)
+product ATI RADEON_M9PLUS	0x5c63	Radeon Mobility 9200
 product ATI RADEON_RV280_SE	0x5d44	Radeon 9200 SE
-product ATI RADEON_X800_GTO	0x5d4f	Radeon X800 GTO
+product ATI RADEON_X800XT_M28	0x5d48	Radeon X800 XT M28
+product ATI FIREGL_V5100_M28	0x5d49	FireGL V5100 M28
+product ATI MOBILITY_X800_M28	0x5d4a	Radeon Mobility X800 M28
+product ATI RADEON_X850_R480	0x5d4c	Radeon X850
+product ATI RADEON_X850XTPER480	0x5d4d	Radeon X850 XT PE
+product ATI RADEON_X850SE_R480	0x5d4e	Radeon X850 SE
+product ATI RADEON_X800_GTO	0x5d4f	Radeon X800
+product ATI FIREGL_R480		0x5d50	FireGL R480
+product ATI RADEON_X850XT_R480	0x5d52	Radeon X850XT
+product ATI RADEON_X800XT_R423	0x5d57	Radeon X800XT
 product ATI RADEON_X800_GTO_S	0x5d6f	Radeon X800 GTO Sec
+product ATI FIREGL_V5000_R410	0x5e48	FireGL V5000
+product ATI RADEON_X700XT_R410	0x5e4a	FireGL X700 XT
+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_SE_S	0x5e6f	Radeon X700 SE Sec
 product ATI RS100_PCI		0x700f	RS100 PCI
 product ATI RS200_PCI		0x7010	RS200 PCI
-product ATI RADEON_X1800	0x7109	Radeon X1800
+product ATI RADEON_X1800A	0x7100	Radeon X1800
+product ATI RADEON_X1800XT	0x7101	Radeon X1800 XT
+product ATI MOBILITY_X1800	0x7102	Radeon Mobility X1800
+product ATI FIREGL_M_V7200	0x7103	FireGL Mobility V7200
+product ATI FIREGL_V7200	0x7104	FireGL V7200
+product ATI FIREGL_V5300	0x7105	FireGL V5300
+product ATI FIREGL_M_V7100	0x7106	FireGL Mobility V7100
+product ATI RADEON_X1800B	0x7108	Radeon X1800
+product ATI RADEON_X1800C	0x7109	Radeon X1800
+product ATI RADEON_X1800D	0x710a	Radeon X1800
+product ATI RADEON_X1800E	0x710b	Radeon X1800
+product ATI RADEON_X1800F	0x710c	Radeon X1800
+product ATI FIREGL_V7300	0x710e	FireGL V7300
+product ATI FIREGL_V7350	0x710f	FireGL V7350
 product ATI RADEON_X1600	0x7140	Radeon X1600
+product ATI RV505_1		0x7141	RV505
+product ATI RADEON_X1300_X1550	0x7142	Radeon X1300/X1550
+product ATI RADEON_X1550	0x7143	Radeon X1550
+product ATI M54_GL		0x7144	M54-GL
 product ATI RADEON_X1400	0x7145	Radeon Mobility X1400
+product ATI RADEON_X1550_X1300	0x7146	Radeon X1300/X1550
+product ATI RADEON_X1550_64	0x7147	RADEON X1550 64-bit
 product ATI RADEON_X1300_M52	0x7149	Radeon Mobility X1300 M52-64
+product ATI MOBILITY_X1300_4A	0x714a	Radeon Mobility X1300
+product ATI MOBILITY_X1300_4B	0x714b	Radeon Mobility X1300
+product ATI MOBILITY_X1300_4C	0x714c	Radeon Mobility X1300
+product ATI RADEON_X1300_4D	0x714d	Radeon X1300
+product ATI RADEON_X1300_4E	0x714e	Radeon X1300
+product ATI RV505_2		0x714f	Radeon X1300
+product ATI RV505_3		0x7151	RV505
+product ATI FIREGL_V3300	0x7152	FireGL V3300
+product ATI FIREGL_V3350	0x7153	FireGL V3350
+product ATI RADEON_X1300_5E	0x715e	Radeon X1300
+product ATI RADEON_X1550_64_2	0x715f	Radeon X1550
 product ATI RADEON_X1600_S	0x7160	Radeon X1600 Sec
+product ATI RADEON_X1300X1550	0x7180	Radeon X1300/X1550
+product ATI RADEON_X1600_81	0x7181	Radeon X1600
 product ATI RADEON_X1300PRO	0x7183	Radeon X1300 Pro
+product ATI RADEON_X1450	0x7186	Radeon X1450
 product ATI RADEON_X1300	0x7187	Radeon X1300
+product ATI RADEON_X2300	0x7188	Radeon Mobility X2300
+product ATI RADEON_X2300_2	0x718a	Radeon Mobility X2300
+product ATI MOBILITY_X1350	0x718b	Radeon Mobility X1350
+product ATI MOBILITY_X1350_2	0x718c	Radeon Mobility X1350
+product ATI MOBILITY_X1450	0x718d	Radeon Mobility X1450
+product ATI RADEON_X1300_8F	0x718f	Radeon X1300
+product ATI RADEON_X1550_2	0x7193	Radeon X1550
+product ATI MOBILITY_X1350_3	0x7196	Radeon Mobility X1350
+product ATI FIREMV_2250		0x719b	FireMV 2250
+product ATI RADEON_X1550_64_3	0x719f	Radeon X1550 64-bit
 product ATI RADEON_X1300PRO_S	0x71a3	Radeon X1300 Pro Sec
 product ATI RADEON_X1300_S	0x71a7	Radeon X1300 Sec
+product ATI RADEON_X1600_C0	0x71c0	Radeon X1600
+product ATI RADEON_X1650	0x71c1	Radeon X1650
 product ATI RADEON_X1600_PRO	0x71c2	Radeon X1600 Pro
+product ATI RADEON_X1600_C3	0x71c3	Radeon X1600
+product ATI FIREGL_V5200	0x71c4	FireGL V5200
 product ATI RADEON_X1600_M	0x71c5	Radeon Mobility X1600
 product ATI RADEON_X1650_PRO	0x71c6  Radeon X1650 Pro
 product ATI RADEON_X1650_PRO2	0x71c7  Radeon X1650 Pro
+product ATI RADEON_X1600_CD	0x71cd  Radeon X1600
+product ATI RADEON_X1300_XT	0x71ce  Radeon X1300 XT
+product ATI FIREGL_V3400	0x71d2	FireGL V3400
 product ATI RV530_M56		0x71d4	Mobility FireGL V5250
+product ATI RADEON_X1700	0x71d5	Radeon X1700
+product ATI RADEON_X1700XT	0x71d6	Radeon X1700 XT
+product ATI FIREGL_V5200_1	0x71da	FireGL V5200
+product ATI MOBILITY_X1700	0x71de	Radeon Mobility X1700
 product ATI RADEON_X1600_PRO_S	0x71e2	Radeon X1600 Pro Sec
 product ATI RADEON_X1650_PRO_S	0x71e6	Radeon X1650 Pro Sec
 product ATI RADEON_X1650_PRO2_S	0x71e7	Radeon X1650 Pro Sec
+product ATI RADEON_X2300HD	0x7200	Radeon X2300HD
+product ATI MOBILITY_X2300HD	0x7210	Radeon Mobility X2300HD
+product ATI MOBILITY_X2300HD_1	0x7211	Radeon Mobility X2300HD
+product ATI RADEON_X1950_40	0x7240	Radeon X1950
+product ATI RADEON_X1900_43	0x7243	Radeon X1900
+product ATI RADEON_X1950_44	0x7244	Radeon X1950
+product ATI RADEON_X1900_45	0x7245	Radeon X1900
+product ATI RADEON_X1900_46	0x7246	Radeon X1900
+product ATI RADEON_X1900_47	0x7247	Radeon X1900
+product ATI RADEON_X1900_48	0x7248	Radeon X1900
+product ATI RADEON_X1900_49	0x7249	Radeon X1900
+product ATI RADEON_X1900_4A	0x724a	Radeon X1900
+product ATI RADEON_X1900_4B	0x724b	Radeon X1900
+product ATI RADEON_X1900_4C	0x724c	Radeon X1900
+product ATI RADEON_X1900_4D	0x724d	Radeon X1900
+product ATI STREAM_PROCESSOR	0x724e	AMD Stream Processor
+product ATI RADEON_X1900_4F	0x724f	Radeon X1900
 product ATI RADEON_X1950_PRO	0x7280	Radeon X1950 Pro
+product ATI RV560		0x7281	RV560
+product ATI RV560_1		0x7283	RV560
+product ATI MOBILITY_X1900	0x7284	Radeon Mobility X1900
+product ATI RV560_2		0x7287	RV560
+product ATI RADEON_X1950GT	0x7288	Radeon X1950 GT
+product ATI RV570		0x7289	RV570
+product ATI RV570_2		0x728b	RV570
+product ATI FIREGL_V7400	0x728c	FireGL V7400
+product ATI RV560_3		0x7290	Rv560
 product ATI RADEON_RX1650_XT	0x7291	Radeon RX1650 XT
+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 RADEON_9000IGP	0x7834	Radeon 9000/9100 IGP
+product ATI RADEON_RS350IGP	0x7835	Radeon RS350IGP
 product ATI RS690_HB		0x7910	RS690 Host
 product ATI RS740_HB		0x7911	RS740 Host
 product ATI RS690_PCIE_1	0x7912	RS690 PCIE
@@ -1084,6 +1272,7 @@ product ATI RS690_PCIE_4	0x7916	RS690 PCIE
 product ATI RS690_PCIE_5	0x7917	RS690 PCIE
 product ATI RS690_HDA		0x7919	RS690 HD Audio
 product ATI RADEON_X1250	0x791e	Radeon X1250
+product ATI RADEON_X1250IGP	0x791e	Radeon X1250 IGP
 product ATI RADEON_2100		0x796e	Radeon 2100
 product ATI RADEON_HD4850	0x9442	Radeon HD 4850
 product ATI RADEON_HD2400_XT	0x94c1	Radeon HD 2400 XT
@@ -4074,6 +4263,7 @@ product S3 TRIO3_DX2		0x8a13	Trio3 DX2
 product S3 SAVAGE3D		0x8a20	Savage 3D
 product S3 SAVAGE3D_M		0x8a21	Savage 3DM
 product S3 SAVAGE4		0x8a22	Savage 4
+product S3 SAVAGE4_2		0x8a23	Savage 4
 product S3 PROSAVAGE_PM133	0x8a25	ProSavage PM133
 product S3 PROSAVAGE_KM133	0x8a26	ProSavage KM133
 product S3 VIRGE_MX		0x8c01	ViRGE MX
@@ -4082,10 +4272,19 @@ product S3 SAVAGE_MXMV		0x8c10	Savage/MX-MV
 product S3 SAVAGE_MX		0x8c11	Savage/MX
 product S3 SAVAGE_IXMV		0x8c12	Savage/IX-MV
 product S3 SAVAGE_IX		0x8c13	Savage/IX
-product S3 SUPERSAVAGE		0x8c2e	SuperSavage
+product S3 SUPERSAVAGE_MX128		0x8c22	SuperSavage MX/128
+product S3 SUPERSAVAGE_MX64		0x8c24	SuperSavage MX/64
+product S3 SUPERSAVAGE_MX64C		0x8c26	SuperSavage MX/64C
+product S3 SUPERSAVAGE_IX128SDR		0x8c2a	SuperSavage IX/128 SDR
+product S3 SUPERSAVAGE_IX128DDR		0x8c2b	SuperSavage IX/128 DDR
+product S3 SUPERSAVAGE_IX64SDR		0x8c2c	SuperSavage IX/64 SDR
+product S3 SUPERSAVAGE_IX64DDR		0x8c2d	SuperSavage IX/64 DDR
+product S3 SUPERSAVAGE_IXCSDR		0x8c2e	SuperSavage IX/C SDR
+product S3 SUPERSAVAGE_IXCDDR		0x8c2f	SuperSavage IX/C DDR
 product S3 TWISTER		0x8d01	Twister
 product S3 TWISTER_K		0x8d02	Twister-K
-product S3 PROSAVAGE_DDR	0x8d04	ProSavage DDR
+product S3 PROSAVAGE_DDR	0x8d03	ProSavage DDR
+product S3 PROSAVAGE_DDR_K	0x8d04	ProSavage DDR-K
 product S3 SONICVIBES		0xca00	SonicVibes
 
 /* SafeNet products */
@@ -4199,6 +4398,7 @@ product SIS 964			0x0964	964 ISA
 product SIS 965			0x0965	965 ISA
 product SIS 966			0x0966	966 ISA
 product SIS 968			0x0968	968 ISA
+product SIS 5300		0x5300	540 VGA
 product SIS 5315		0x5315	530 VGA
 product SIS 5511		0x5511	5511
 product SIS 5512		0x5512	5512
@@ -4224,6 +4424,7 @@ product SIS 7013		0x7013	7013 Modem
 product SIS 7016		0x7016	7016 10/100BaseTX
 product SIS 7018		0x7018	7018 Audio
 product SIS 7019		0x7019	7019 Audio
+product SIS 7300		0x7300	7300 VGA
 product SIS 966_HDA		0x7502	966 HD Audio
 
 /* SMC products */
@@ -4887,6 +5088,7 @@ product XENSOURCE PLATFORMDEV	0x0001	Platform Device
 
 /* XGI Technology products */
 product XGI VOLARI_Z7		0x0020	Volari Z7
+product XGI VOLARI_V3XT		0x0040	Volari V3XT
 
 /* Xircom products */
 product XIRCOM X3201_3		0x0002	X3201-3