sync

2 files changed, 1162 insertions, 156 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index db7d16b2f7c..41f29ecf84b 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	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 $	*/
 
@@ -425,8 +425,12 @@
 #define	PCI_PRODUCT_3DFX_VOODOO	0x0001		/* Voodoo */
 #define	PCI_PRODUCT_3DFX_VOODOO2	0x0002		/* Voodoo2 */
 #define	PCI_PRODUCT_3DFX_BANSHEE	0x0003		/* Banshee */
+#define	PCI_PRODUCT_3DFX_VOODOO32000	0x0004		/* Voodoo3 */
 #define	PCI_PRODUCT_3DFX_VOODOO3	0x0005		/* Voodoo3 */
+#define	PCI_PRODUCT_3DFX_VOODOO4	0x0007		/* Voodoo4 */
 #define	PCI_PRODUCT_3DFX_VOODOO5	0x0009		/* Voodoo5 */
+#define	PCI_PRODUCT_3DFX_VOODOO44200	0x000b		/* Voodoo4 */
+
 
 /* 3D Labs products */
 #define	PCI_PRODUCT_3DLABS_300SX	0x0001		/* 300SX */
@@ -840,22 +844,38 @@
 #define	PCI_PRODUCT_ASUSTEK_HFCPCI	0x0675		/* ISDN */
 
 /* ATI Technologies */
-#define	PCI_PRODUCT_ATI_RADEON_M241P	0x3150		/* Radeon Mobility X600 */
-#define	PCI_PRODUCT_ATI_FIREGL_V3200	0x3154		/* FireGL V3200 */
-#define	PCI_PRODUCT_ATI_RADEON_X600_RV380	0x3e50		/* Radeon X600 (RV380) */
-#define	PCI_PRODUCT_ATI_RADEON_X600_RV380_S	0x3e70		/* Radeon X600 (RV380) Sec */
+#define	PCI_PRODUCT_ATI_RADEON_M241P	0x3150		/* Radeon M241P */
+#define	PCI_PRODUCT_ATI_RADEON_X300M24	0x3150		/* Radeon X300 M24 */
+#define	PCI_PRODUCT_ATI_FIREGL_M24GL	0x3154		/* FireGL M24 GL */
+#define	PCI_PRODUCT_ATI_RADEON_X600_RV380	0x3e50		/* Radeon X600 */
+#define	PCI_PRODUCT_ATI_FIREGL_V3200	0x3e54		/* FireGL V3200 */
+#define	PCI_PRODUCT_ATI_RADEON_X600_RV380_S	0x3e70		/* Radeon X600 Sec */
+#define	PCI_PRODUCT_ATI_RADEON_IGP320	0x4136		/* Radeon IGP 320 */
+#define	PCI_PRODUCT_ATI_RADEON_IGP340	0x4137		/* Radeon IGP 340 */
 #define	PCI_PRODUCT_ATI_RADEON_9500PRO	0x4144		/* Radeon 9500 Pro */
+#define	PCI_PRODUCT_ATI_RADEON_AE9700PRO	0x4145		/* Radeon AE 9700 Pro */
+#define	PCI_PRODUCT_ATI_RADEON_AF9600TX	0x4146		/* Radeon AF 9600TX */
+#define	PCI_PRODUCT_ATI_FIREGL_AGZ1	0x4147		/* FireGL AGZ1 */
+#define	PCI_PRODUCT_ATI_RADEON_AH_9800SE	0x4148		/* Radeon AH 9800 SE */
+#define	PCI_PRODUCT_ATI_RADEON_AI_9800	0x4149		/* Radeon AI 9800 */
+#define	PCI_PRODUCT_ATI_RADEON_AJ_9800	0x414a		/* Radeon AJ 9800 */
+#define	PCI_PRODUCT_ATI_FIREGL_AKX2	0x414b		/* FireGL AK X2 */
 #define	PCI_PRODUCT_ATI_RADEON_9600PRO	0x4150		/* Radeon 9600 Pro */
-#define	PCI_PRODUCT_ATI_RADEON_9600LE	0x4151		/* Radeon 9600 LE */
-#define	PCI_PRODUCT_ATI_RADEON_9600XT	0x4152		/* Radeon 9600 XT */
+#define	PCI_PRODUCT_ATI_RADEON_9600LE	0x4151		/* Radeon 9600 */
+#define	PCI_PRODUCT_ATI_RADEON_9600XT	0x4152		/* Radeon 9600 */
 #define	PCI_PRODUCT_ATI_RADEON_9550	0x4153		/* Radeon 9550 */
+#define	PCI_PRODUCT_ATI_FIREGL_ATT2	0x4154		/* FireGL */
+#define	PCI_PRODUCT_ATI_RADEON_9650	0x4155		/* Radeon 9650 */
+#define	PCI_PRODUCT_ATI_FIREGL_AVT2	0x4156		/* FireGL */
 #define	PCI_PRODUCT_ATI_MACH32	0x4158		/* Mach32 */
 #define	PCI_PRODUCT_ATI_RADEON_9500PRO_S	0x4164		/* Radeon 9500 Pro Sec */
 #define	PCI_PRODUCT_ATI_RADEON_9600PRO_S	0x4170		/* Radeon 9600 Pro Sec */
 #define	PCI_PRODUCT_ATI_RADEON_9600LE_S	0x4171		/* Radeon 9600 LE Sec */
 #define	PCI_PRODUCT_ATI_RADEON_9600XT_S	0x4172		/* Radeon 9600 XT Sec */
 #define	PCI_PRODUCT_ATI_RADEON_9550_S	0x4173		/* Radeon 9550 Sec */
-#define	PCI_PRODUCT_ATI_R200_BB	0x4242		/* Radeon 8500 BB */
+#define	PCI_PRODUCT_ATI_RADEON_IGP_RS250	0x4237		/* Radeon IGP */
+#define	PCI_PRODUCT_ATI_R200_BB	0x4242		/* Radeon 8500 */
+#define	PCI_PRODUCT_ATI_R200_BC	0x4243		/* Radeon BC R200 */
 #define	PCI_PRODUCT_ATI_RADEON_IGP320M	0x4336		/* Radeon IGP 320M */
 #define	PCI_PRODUCT_ATI_MOBILITY_M6	0x4337		/* Mobility M6 */
 #define	PCI_PRODUCT_ATI_SB200_AUDIO	0x4341		/* SB200 AC97 */
@@ -919,96 +939,163 @@
 #define	PCI_PRODUCT_ATI_SB700_OHCI_5	0x439b		/* SB700 USB */
 #define	PCI_PRODUCT_ATI_SB700_IDE	0x439c		/* SB700 IDE */
 #define	PCI_PRODUCT_ATI_SB700_ISA	0x439d		/* SB700 ISA */
+#define	PCI_PRODUCT_ATI_RADEON_MIGP_RS250	0x4437		/* Radeon Mobility IGP */
 #define	PCI_PRODUCT_ATI_MACH64_ET	0x4554		/* Mach64 ET */
 #define	PCI_PRODUCT_ATI_RAGEPRO	0x4742		/* Rage Pro */
-#define	PCI_PRODUCT_ATI_MACH64_GD	0x4744		/* Mach64 GD */
-#define	PCI_PRODUCT_ATI_MACH64_GI	0x4749		/* Mach64 GI */
-#define	PCI_PRODUCT_ATI_MACH64_GL	0x474c		/* Mach64 GL */
-#define	PCI_PRODUCT_ATI_MACH64_GM	0x474d		/* Mach64 GM */
-#define	PCI_PRODUCT_ATI_MACH64_GN	0x474e		/* Mach64 GN */
-#define	PCI_PRODUCT_ATI_MACH64_GO	0x474f		/* Mach64 GO */
-#define	PCI_PRODUCT_ATI_MACH64_GP	0x4750		/* Mach64 GP */
-#define	PCI_PRODUCT_ATI_MACH64_GQ	0x4751		/* Mach64 GQ */
+#define	PCI_PRODUCT_ATI_MACH64_GD	0x4744		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GI	0x4749		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GL	0x474c		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GM	0x474d		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GN	0x474e		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GO	0x474f		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GP	0x4750		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GQ	0x4751		/* Mach64 */
 #define	PCI_PRODUCT_ATI_RAGEXL	0x4752		/* Rage XL */
-#define	PCI_PRODUCT_ATI_MACH64_GS	0x4753		/* Mach64 GS */
-#define	PCI_PRODUCT_ATI_MACH64_GT	0x4754		/* Mach64 GT */
-#define	PCI_PRODUCT_ATI_MACH64_GU	0x4755		/* Mach64 GU */
-#define	PCI_PRODUCT_ATI_MACH64_GV	0x4756		/* Mach64 GV */
-#define	PCI_PRODUCT_ATI_MACH64_GW	0x4757		/* Mach64 GW */
-#define	PCI_PRODUCT_ATI_MACH64_GX	0x4758		/* Mach64 GX */
-#define	PCI_PRODUCT_ATI_MACH64_GY	0x4759		/* Mach64 GY */
-#define	PCI_PRODUCT_ATI_MACH64_GZ	0x475a		/* Mach64 GZ */
+#define	PCI_PRODUCT_ATI_MACH64_GS	0x4753		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GT	0x4754		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GU	0x4755		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GV	0x4756		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GW	0x4757		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GX	0x4758		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GY	0x4759		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_GZ	0x475a		/* Mach64 */
 #define	PCI_PRODUCT_ATI_RV250	0x4966		/* Radeon 9000 */
+#define	PCI_PRODUCT_ATI_RADEON_IG9000	0x4966		/* Radeon 9000 */
 #define	PCI_PRODUCT_ATI_RV250_S	0x496e		/* Radeon 9000 Sec */
+#define	PCI_PRODUCT_ATI_RADEON_JHX800	0x4a48		/* Radeon X800 */
 #define	PCI_PRODUCT_ATI_RADEON_X800PRO	0x4a49		/* Radeon X800 Pro */
+#define	PCI_PRODUCT_ATI_RADEON_X800SE	0x4a4a		/* Radeon X800SE */
+#define	PCI_PRODUCT_ATI_RADEON_X800XT	0x4a4b		/* Radeon X800XT */
+#define	PCI_PRODUCT_ATI_RADEON_X800	0x4a4c		/* Radeon X800 */
+#define	PCI_PRODUCT_ATI_FIREGL_X3256	0x4a4d		/* FireGL X3-256 */
+#define	PCI_PRODUCT_ATI_MOBILITY_M18	0x4a4e		/* Radeon Mobility M18 */
+#define	PCI_PRODUCT_ATI_RADEON_JOX800SE	0x4a4f		/* Radeon X800 SE */
+#define	PCI_PRODUCT_ATI_RADEON_X800XTPE	0x4a50		/* Radeon X800 XT */
+#define	PCI_PRODUCT_ATI_RADEON_AIW_X800VE	0x4a54		/* Radeon AIW X800 VE */
 #define	PCI_PRODUCT_ATI_RADEON_X800PRO_S	0x4a69		/* Radeon X800 Pro Sec */
-#define	PCI_PRODUCT_ATI_MACH64_LB	0x4c42		/* Mach64 LB */
-#define	PCI_PRODUCT_ATI_MACH64_LD	0x4c44		/* Mach64 LD */
-#define	PCI_PRODUCT_ATI_RAGE128_LE	0x4c45		/* Rage128 LE */
+#define	PCI_PRODUCT_ATI_RADEON_X850XT	0x4b49		/* Radeon X850 XT */
+#define	PCI_PRODUCT_ATI_RADEON_X850SE	0x4b4a		/* Radeon X850 SE */
+#define	PCI_PRODUCT_ATI_RADEON_X850PRO	0x4b4b		/* Radeon X850 Pro */
+#define	PCI_PRODUCT_ATI_RADEON_X850XTPE	0x4b4c		/* Radeon X850 XT PE */
+#define	PCI_PRODUCT_ATI_MACH64_LB	0x4c42		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_LD	0x4c44		/* Mach64 */
+#define	PCI_PRODUCT_ATI_RAGE128_LE	0x4c45		/* Rage128 */
 #define	PCI_PRODUCT_ATI_MOBILITY_M3	0x4c46		/* Mobility M3 */
-#define	PCI_PRODUCT_ATI_MACH64_LG	0x4c47		/* Mach64 LG */
-#define	PCI_PRODUCT_ATI_MACH64_LI	0x4c49		/* Mach64 LI */
+#define	PCI_PRODUCT_ATI_MACH64_LG	0x4c47		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_LI	0x4c49		/* Mach64 */
 #define	PCI_PRODUCT_ATI_MOBILITY_1	0x4c4d		/* Mobility 1 */
-#define	PCI_PRODUCT_ATI_MACH64_LN	0x4c4e		/* Mach64 LN */
-#define	PCI_PRODUCT_ATI_MACH64_LP	0x4c50		/* Mach64 LP */
-#define	PCI_PRODUCT_ATI_MACH64_LQ	0x4c51		/* Mach64 LQ */
+#define	PCI_PRODUCT_ATI_MACH64_LN	0x4c4e		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_LP	0x4c50		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_LQ	0x4c51		/* Mach64 */
 #define	PCI_PRODUCT_ATI_RAGE_PM	0x4c52		/* Rage P/M */
-#define	PCI_PRODUCT_ATI_MACH64LS	0x4c53		/* Mach64 LS */
-#define	PCI_PRODUCT_ATI_RADEON_M7LW	0x4c57		/* Radeon Mobility M7 LW */
-#define	PCI_PRODUCT_ATI_RADEON_M6LY	0x4c59		/* Radeon Mobility M6 LY */
-#define	PCI_PRODUCT_ATI_RADEON_M6LZ	0x4c5a		/* Radeon Mobility M6 LZ */
-#define	PCI_PRODUCT_ATI_RADEON_M9Lf	0x4c66		/* Radeon Mobility M9 Lf */
-#define	PCI_PRODUCT_ATI_RAGE128_MF	0x4d46		/* Rage 128 Mobility MF */
-#define	PCI_PRODUCT_ATI_RAGE128_ML	0x4d4c		/* Rage 128 Mobility ML */
+#define	PCI_PRODUCT_ATI_MACH64LS	0x4c53		/* Mach64 */
+#define	PCI_PRODUCT_ATI_RADEON_M7LW	0x4c57		/* Radeon Mobility M7 */
+#define	PCI_PRODUCT_ATI_FIREGL_M7	0x4c58		/* FireGL Mobility 7800 M7 */
+#define	PCI_PRODUCT_ATI_RADEON_M6LY	0x4c59		/* Radeon Mobility M6 */
+#define	PCI_PRODUCT_ATI_RADEON_M6LZ	0x4c5a		/* Radeon Mobility M6 */
+#define	PCI_PRODUCT_ATI_RADEON_M9LD	0x4c64		/* Radeon Mobility M9 */
+#define	PCI_PRODUCT_ATI_RADEON_M9Lf	0x4c66		/* Radeon Mobility M9 */
+#define	PCI_PRODUCT_ATI_RADEON_M9Lg	0x4c66		/* Radeon Mobility M9 */
+#define	PCI_PRODUCT_ATI_RAGE128_MF	0x4d46		/* Rage 128 Mobility */
+#define	PCI_PRODUCT_ATI_RAGE128_ML	0x4d4c		/* Rage 128 Mobility */
 #define	PCI_PRODUCT_ATI_R300	0x4e44		/* Radeon 9500/9700 */
 #define	PCI_PRODUCT_ATI_RADEON9500_PRO	0x4e45		/* Radeon 9500 Pro */
-#define	PCI_PRODUCT_ATI_RADEON_9800XT	0x4e4a		/* Radeon 9800 XT */
+#define	PCI_PRODUCT_ATI_RADEON9600TX	0x4e46		/* Radeon 9600 TX */
+#define	PCI_PRODUCT_ATI_FIREGL_X1	0x4e47		/* FireGL X1 */
 #define	PCI_PRODUCT_ATI_R350	0x4e48		/* Radeon 9800 Pro */
-#define	PCI_PRODUCT_ATI_RV350	0x4e50		/* Radeon Mobility M10 NP */
-#define	PCI_PRODUCT_ATI_RV350_WS	0x4e54		/* Radeon Mobility M10 NT */
+#define	PCI_PRODUCT_ATI_RADEON9800	0x4e49		/* RAdeon 9800 */
+#define	PCI_PRODUCT_ATI_RADEON_9800XT	0x4e4a		/* Radeon 9800 XT */
+#define	PCI_PRODUCT_ATI_FIREGL_X2	0x4e4b		/* FireGL X2 */
+#define	PCI_PRODUCT_ATI_RV350	0x4e50		/* Radeon Mobility M10 */
+#define	PCI_PRODUCT_ATI_RV350NQ	0x4e51		/* Radeon Mobility M10 */
+#define	PCI_PRODUCT_ATI_RV350NR	0x4e52		/* Radeon Mobility M10 */
+#define	PCI_PRODUCT_ATI_RV350NS	0x4e53		/* Radeon Mobility M10 */
+#define	PCI_PRODUCT_ATI_RV350_WS	0x4e54		/* Radeon Mobility M10 */
+#define	PCI_PRODUCT_ATI_MOBILITY_9550	0x4e56		/* Radeon Mobility 9550 */
 #define	PCI_PRODUCT_ATI_R300_S	0x4e64		/* Radeon 9500/9700 Sec */
 #define	PCI_PRODUCT_ATI_R350_S	0x4e68		/* Radeon 9800 Pro Sec */
-#define	PCI_PRODUCT_ATI_RAGE128_PD	0x5044		/* Rage 128 Pro PD */
+#define	PCI_PRODUCT_ATI_RAGE128_PA	0x5041		/* Rage 128 Pro */
+#define	PCI_PRODUCT_ATI_RAGE128_PB	0x5042		/* Rage 128 Pro */
+#define	PCI_PRODUCT_ATI_RAGE128_PC	0x5043		/* Rage 128 Pro */
+#define	PCI_PRODUCT_ATI_RAGE128_PD	0x5044		/* Rage 128 Pro */
+#define	PCI_PRODUCT_ATI_RAGE128_PE	0x5045		/* Rage 128 Pro */
 #define	PCI_PRODUCT_ATI_RAGE_FURY	0x5046		/* Rage Fury */
-#define	PCI_PRODUCT_ATI_RAGE128_PK	0x5052		/* Rage 128 PK */
+#define	PCI_PRODUCT_ATI_RAGE128_PG	0x5047		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PH	0x5048		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PI	0x5049		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PJ	0x504a		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PK	0x504b		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PL	0x504c		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PM	0x504d		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PN	0x504e		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PO	0x504f		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PP	0x5050		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PQ	0x5051		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PR	0x5052		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PS	0x5053		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PT	0x5054		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PU	0x5055		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PV	0x5056		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PW	0x5057		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_PX	0x5058		/* Rage 128 PX */
 #define	PCI_PRODUCT_ATI_RADEON_AIW	0x5144		/* AIW Radeon */
-#define	PCI_PRODUCT_ATI_RADEON_QE	0x5145		/* Radeon QE */
-#define	PCI_PRODUCT_ATI_RADEON_QF	0x5146		/* Radeon QF */
-#define	PCI_PRODUCT_ATI_RADEON_QG	0x5147		/* Radeon QG */
-#define	PCI_PRODUCT_ATI_R200_QL	0x514c		/* Radeon 8500 QL */
-#define	PCI_PRODUCT_ATI_R200_QM	0x514d		/* Radeon 9100 QM */
-#define	PCI_PRODUCT_ATI_R200_QN	0x514e		/* Radeon 8500 QN */
-#define	PCI_PRODUCT_ATI_R200_QO	0x514f		/* Radeon 8500 QO */
-#define	PCI_PRODUCT_ATI_RV200_QW	0x5157		/* Radeon 7500 QW */
-#define	PCI_PRODUCT_ATI_RADEON_QY	0x5159		/* Radeon VE QY */
-#define	PCI_PRODUCT_ATI_RADEON_QZ	0x515a		/* Radeon VE QZ */
+#define	PCI_PRODUCT_ATI_RADEON_QE	0x5145		/* Radeon */
+#define	PCI_PRODUCT_ATI_RADEON_QF	0x5146		/* Radeon */
+#define	PCI_PRODUCT_ATI_RADEON_QG	0x5147		/* Radeon */
+#define	PCI_PRODUCT_ATI_RADEON_QH	0x5148		/* Radeon */
+#define	PCI_PRODUCT_ATI_R200_QL	0x514c		/* Radeon 8500 */
+#define	PCI_PRODUCT_ATI_R200_QM	0x514d		/* Radeon 9100 */
+#define	PCI_PRODUCT_ATI_R200_QN	0x514e		/* Radeon 8500 */
+#define	PCI_PRODUCT_ATI_R200_QO	0x514f		/* Radeon 8500 */
+#define	PCI_PRODUCT_ATI_RV200_QW	0x5157		/* Radeon 7500 */
+#define	PCI_PRODUCT_ATI_RV200_QX	0x5158		/* Radeon 7500 */
+#define	PCI_PRODUCT_ATI_RADEON_QY	0x5159		/* Radeon VE */
+#define	PCI_PRODUCT_ATI_RADEON_QZ	0x515a		/* Radeon VE */
 #define	PCI_PRODUCT_ATI_ES1000	0x515e		/* ES1000 */
-#define	PCI_PRODUCT_ATI_R200_Ql	0x516c		/* Radeon 8500 Ql */
-#define	PCI_PRODUCT_ATI_RAGE128_GL	0x5245		/* Rage 128 GL */
+#define	PCI_PRODUCT_ATI_R200_Ql	0x516c		/* Radeon 8500 */
+#define	PCI_PRODUCT_ATI_RAGE128_GL	0x5245		/* Rage 128 */
 #define	PCI_PRODUCT_ATI_RAGE_MAGNUM	0x5246		/* Rage Magnum */
-#define	PCI_PRODUCT_ATI_RAGE128_RG	0x5247		/* Rage 128 RG */
-#define	PCI_PRODUCT_ATI_RAGE128_RK	0x524b		/* Rage 128 RK */
-#define	PCI_PRODUCT_ATI_RAGE128_VR	0x524c		/* Rage 128 VR */
-#define	PCI_PRODUCT_ATI_RAGE128_SH	0x5348		/* Rage 128 SH */
-#define	PCI_PRODUCT_ATI_RAGE128_SK	0x534b		/* Rage 128 SK */
-#define	PCI_PRODUCT_ATI_RAGE128_SL	0x534c		/* Rage 128 SL */
-#define	PCI_PRODUCT_ATI_RAGE128_SM	0x534d		/* Rage 128 SM */
+#define	PCI_PRODUCT_ATI_RAGE128_RG	0x5247		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_RK	0x524b		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_VR	0x524c		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_SH	0x5348		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_SK	0x534b		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_SL	0x534c		/* Rage 128 */
+#define	PCI_PRODUCT_ATI_RAGE128_SM	0x534d		/* Rage 128 */
 #define	PCI_PRODUCT_ATI_RAGE128	0x534e		/* Rage 128 */
-#define	PCI_PRODUCT_ATI_RAGE128_TF	0x5446		/* Rage 128 Pro TF */
-#define	PCI_PRODUCT_ATI_RAGE128_TL	0x544c		/* Rage 128 Pro TL */
-#define	PCI_PRODUCT_ATI_RAGE128_TR	0x5452		/* Rage 128 Pro TR */
+#define	PCI_PRODUCT_ATI_RAGE128_TF	0x5446		/* Rage 128 Pro */
+#define	PCI_PRODUCT_ATI_RAGE128_TL	0x544c		/* Rage 128 Pro */
+#define	PCI_PRODUCT_ATI_RAGE128_TR	0x5452		/* Rage 128 Pro */
 #define	PCI_PRODUCT_ATI_RADEON_M300_M22	0x5460		/* Radeon Mobility M300 M22 */
-#define	PCI_PRODUCT_ATI_RADEON_X800_RV430	0x554d		/* Radeon X800 (RV430) */
-#define	PCI_PRODUCT_ATI_RADEON_X800_RV430_S	0x556d		/* Radeon X800 (RV430) Sec */
+#define	PCI_PRODUCT_ATI_RADEON_X600_M24C	0x5462		/* Radeon Mobility X600 M24C */
+#define	PCI_PRODUCT_ATI_FIREGL_M44	0x5464		/* FireGL M44 GL 5464 */
+#define	PCI_PRODUCT_ATI_RADEON_X800_RV423	0x5548		/* Radeon X800 */
+#define	PCI_PRODUCT_ATI_RADEON_X800PRORV423	0x5549		/* Radeon X800 Pro */
+#define	PCI_PRODUCT_ATI_RADEON_X800XT_RV423	0x554a		/* Radeon X800 XT PE */
+#define	PCI_PRODUCT_ATI_RADEON_X800SE_RV423	0x554b		/* Radeon X800 SE */
+#define	PCI_PRODUCT_ATI_RADEON_X800XTPRV430	0x554c		/* Radeon X800 XTP */
+#define	PCI_PRODUCT_ATI_RADEON_X800XL_RV430	0x554d		/* Radeon X800 XL */
+#define	PCI_PRODUCT_ATI_RADEON_X800SE_RV430	0x554e		/* Radeon X800 SE */
+#define	PCI_PRODUCT_ATI_RADEON_X800_RV430	0x554f		/* Radeon X800 */
+#define	PCI_PRODUCT_ATI_FIREGL_V7100_RV423	0x5550		/* FireGL V7100 */
+#define	PCI_PRODUCT_ATI_FIREGL_V5100_RV423	0x5551		/* FireGL V5100 */
+#define	PCI_PRODUCT_ATI_FIREGL_UR_RV423	0x5552		/* FireGL */
+#define	PCI_PRODUCT_ATI_FIREGL_UT_RV423	0x5553		/* FireGL */
+#define	PCI_PRODUCT_ATI_RADEON_X800_RV430_S	0x556d		/* Radeon X800 Sec */
+#define	PCI_PRODUCT_ATI_FIREGL_V5000_M26	0x564a		/* Mobility FireGL V5000 M26 */
+#define	PCI_PRODUCT_ATI_FIREGL_V5000_M26b	0x564b		/* Mobility FireGL V5000 M26 */
+#define	PCI_PRODUCT_ATI_RADEON_X700XL_M26	0x564f		/* Radeon Mobility X700 XL M26 */
 #define	PCI_PRODUCT_ATI_RADEON_X700_M26_1	0x5652		/* Radeon Mobility X700 M26 */
 #define	PCI_PRODUCT_ATI_RADEON_X700_M26_2	0x5653		/* Radeon Mobility X700 M26 */
-#define	PCI_PRODUCT_ATI_MACH64_VT	0x5654		/* Mach64 VT */
-#define	PCI_PRODUCT_ATI_MACH64_VU	0x5655		/* Mach64 VU */
-#define	PCI_PRODUCT_ATI_MACH64_VV	0x5656		/* Mach64 VV */
+#define	PCI_PRODUCT_ATI_MACH64_VT	0x5654		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_VU	0x5655		/* Mach64 */
+#define	PCI_PRODUCT_ATI_MACH64_VV	0x5656		/* Mach64 */
+#define	PCI_PRODUCT_ATI_RADEON_X550XTX	0x5657		/* Radeon X550XTX */
 #define	PCI_PRODUCT_ATI_RS300_100_HB	0x5830		/* RS300_100 Host */
 #define	PCI_PRODUCT_ATI_RS300_133_HB	0x5831		/* RS300_133 Host */
 #define	PCI_PRODUCT_ATI_RS300_166_HB	0x5832		/* RS300_166 Host */
 #define	PCI_PRODUCT_ATI_RADEON_IGP9100_HB	0x5833		/* Radeon IGP 9100 Host */
+#define	PCI_PRODUCT_ATI_RADEON_IGP9100_IGP	0x5834		/* Radeon IGP 9100 */
 #define	PCI_PRODUCT_ATI_RADEON_IGP9100	0x5835		/* Radeon Mobility IGP 9100 */
 #define	PCI_PRODUCT_ATI_RADEON_IGP9100_AGP	0x5838		/* Radeon IGP 9100 AGP */
 #define	PCI_PRODUCT_ATI_RADEON_RV280_PRO_S	0x5940		/* Radeon 9200 PRO Sec */
@@ -1024,6 +1111,8 @@
 #define	PCI_PRODUCT_ATI_RADEON_RV280	0x5961		/* Radeon 9200 */
 #define	PCI_PRODUCT_ATI_RADEON_RV280_B	0x5962		/* Radeon 9200 */
 #define	PCI_PRODUCT_ATI_RADEON_RV280_SE_S	0x5964		/* Radeon 9200 SE Sec */
+#define	PCI_PRODUCT_ATI_FIREMV_2200	0x5965		/* FireMV 2200 */
+#define	PCI_PRODUCT_ATI_ES1000_1	0x5969		/* ES1000 */
 #define	PCI_PRODUCT_ATI_RADEON_RS482	0x5974		/* Radeon XPRESS 200 */
 #define	PCI_PRODUCT_ATI_RADEON_RS482_B	0x5975		/* Radeon XPRESS 200M */
 #define	PCI_PRODUCT_ATI_RD790_PCIE_1	0x5978		/* RD790 PCIE */
@@ -1044,42 +1133,141 @@
 #define	PCI_PRODUCT_ATI_RADEON_X600_RV370	0x5b62		/* Radeon X600 (RV370) */
 #define	PCI_PRODUCT_ATI_RADEON_X550	0x5b63		/* Radeon X550 */
 #define	PCI_PRODUCT_ATI_FIREGL_RV370	0x5b64		/* FireGL V3100 */
+#define	PCI_PRODUCT_ATI_FIREMV_2200_5B65	0x5b64		/* FireMV 2200 5B65 */
 #define	PCI_PRODUCT_ATI_RADEON_X300_S	0x5b70		/* Radeon X300 Sec */
-#define	PCI_PRODUCT_ATI_RADEON_X600_RV370_S	0x5b72		/* Radeon X600 (RV370) Sec */
+#define	PCI_PRODUCT_ATI_RADEON_X600_RV370_S	0x5b72		/* Radeon X600 Sec */
 #define	PCI_PRODUCT_ATI_RADEON_X550_S	0x5b73		/* Radeon X550 Sec */
 #define	PCI_PRODUCT_ATI_FIREGL_RV370_S	0x5b74		/* FireGL V3100 Sec */
 #define	PCI_PRODUCT_ATI_RADEON_RV280_M	0x5c61		/* Radeon Mobility 9200 */
-#define	PCI_PRODUCT_ATI_RADEON_M9PLUS	0x5c63		/* Radeon Mobility 9200 (M9+) */
+#define	PCI_PRODUCT_ATI_RADEON_M9PLUS	0x5c63		/* Radeon Mobility 9200 */
 #define	PCI_PRODUCT_ATI_RADEON_RV280_SE	0x5d44		/* Radeon 9200 SE */
-#define	PCI_PRODUCT_ATI_RADEON_X800_GTO	0x5d4f		/* Radeon X800 GTO */
+#define	PCI_PRODUCT_ATI_RADEON_X800XT_M28	0x5d48		/* Radeon X800 XT M28 */
+#define	PCI_PRODUCT_ATI_FIREGL_V5100_M28	0x5d49		/* FireGL V5100 M28 */
+#define	PCI_PRODUCT_ATI_MOBILITY_X800_M28	0x5d4a		/* Radeon Mobility X800 M28 */
+#define	PCI_PRODUCT_ATI_RADEON_X850_R480	0x5d4c		/* Radeon X850 */
+#define	PCI_PRODUCT_ATI_RADEON_X850XTPER480	0x5d4d		/* Radeon X850 XT PE */
+#define	PCI_PRODUCT_ATI_RADEON_X850SE_R480	0x5d4e		/* Radeon X850 SE */
+#define	PCI_PRODUCT_ATI_RADEON_X800_GTO	0x5d4f		/* Radeon X800 */
+#define	PCI_PRODUCT_ATI_FIREGL_R480	0x5d50		/* FireGL R480 */
+#define	PCI_PRODUCT_ATI_RADEON_X850XT_R480	0x5d52		/* Radeon X850XT */
+#define	PCI_PRODUCT_ATI_RADEON_X800XT_R423	0x5d57		/* Radeon X800XT */
 #define	PCI_PRODUCT_ATI_RADEON_X800_GTO_S	0x5d6f		/* Radeon X800 GTO Sec */
+#define	PCI_PRODUCT_ATI_FIREGL_V5000_R410	0x5e48		/* FireGL V5000 */
+#define	PCI_PRODUCT_ATI_RADEON_X700XT_R410	0x5e4a		/* FireGL X700 XT */
+#define	PCI_PRODUCT_ATI_RADEON_X700PRO_R410	0x5e4b		/* FireGL X700 Pro */
+#define	PCI_PRODUCT_ATI_RADEON_X700SE_R410	0x5e4c		/* FireGL X700 SE */
 #define	PCI_PRODUCT_ATI_RADEON_X700_PCIE	0x5e4d		/* Radeon X700 PCIE */
+#define	PCI_PRODUCT_ATI_RADEON_X700SE_PCIE	0x5e4f		/* Radeon X700 SE PCIE */
 #define	PCI_PRODUCT_ATI_RADEON_X700_PCIE_S	0x5e6d		/* Radeon X700 PCIE Sec */
 #define	PCI_PRODUCT_ATI_RADEON_X700_SE	0x5e4f		/* Radeon X700 SE */
 #define	PCI_PRODUCT_ATI_RADEON_X700_SE_S	0x5e6f		/* Radeon X700 SE Sec */
 #define	PCI_PRODUCT_ATI_RS100_PCI	0x700f		/* RS100 PCI */
 #define	PCI_PRODUCT_ATI_RS200_PCI	0x7010		/* RS200 PCI */
-#define	PCI_PRODUCT_ATI_RADEON_X1800	0x7109		/* Radeon X1800 */
+#define	PCI_PRODUCT_ATI_RADEON_X1800A	0x7100		/* Radeon X1800 */
+#define	PCI_PRODUCT_ATI_RADEON_X1800XT	0x7101		/* Radeon X1800 XT */
+#define	PCI_PRODUCT_ATI_MOBILITY_X1800	0x7102		/* Radeon Mobility X1800 */
+#define	PCI_PRODUCT_ATI_FIREGL_M_V7200	0x7103		/* FireGL Mobility V7200 */
+#define	PCI_PRODUCT_ATI_FIREGL_V7200	0x7104		/* FireGL V7200 */
+#define	PCI_PRODUCT_ATI_FIREGL_V5300	0x7105		/* FireGL V5300 */
+#define	PCI_PRODUCT_ATI_FIREGL_M_V7100	0x7106		/* FireGL Mobility V7100 */
+#define	PCI_PRODUCT_ATI_RADEON_X1800B	0x7108		/* Radeon X1800 */
+#define	PCI_PRODUCT_ATI_RADEON_X1800C	0x7109		/* Radeon X1800 */
+#define	PCI_PRODUCT_ATI_RADEON_X1800D	0x710a		/* Radeon X1800 */
+#define	PCI_PRODUCT_ATI_RADEON_X1800E	0x710b		/* Radeon X1800 */
+#define	PCI_PRODUCT_ATI_RADEON_X1800F	0x710c		/* Radeon X1800 */
+#define	PCI_PRODUCT_ATI_FIREGL_V7300	0x710e		/* FireGL V7300 */
+#define	PCI_PRODUCT_ATI_FIREGL_V7350	0x710f		/* FireGL V7350 */
 #define	PCI_PRODUCT_ATI_RADEON_X1600	0x7140		/* Radeon X1600 */
+#define	PCI_PRODUCT_ATI_RV505_1	0x7141		/* RV505 */
+#define	PCI_PRODUCT_ATI_RADEON_X1300_X1550	0x7142		/* Radeon X1300/X1550 */
+#define	PCI_PRODUCT_ATI_RADEON_X1550	0x7143		/* Radeon X1550 */
+#define	PCI_PRODUCT_ATI_M54_GL	0x7144		/* M54-GL */
 #define	PCI_PRODUCT_ATI_RADEON_X1400	0x7145		/* Radeon Mobility X1400 */
+#define	PCI_PRODUCT_ATI_RADEON_X1550_X1300	0x7146		/* Radeon X1300/X1550 */
+#define	PCI_PRODUCT_ATI_RADEON_X1550_64	0x7147		/* RADEON X1550 64-bit */
 #define	PCI_PRODUCT_ATI_RADEON_X1300_M52	0x7149		/* Radeon Mobility X1300 M52-64 */
+#define	PCI_PRODUCT_ATI_MOBILITY_X1300_4A	0x714a		/* Radeon Mobility X1300 */
+#define	PCI_PRODUCT_ATI_MOBILITY_X1300_4B	0x714b		/* Radeon Mobility X1300 */
+#define	PCI_PRODUCT_ATI_MOBILITY_X1300_4C	0x714c		/* Radeon Mobility X1300 */
+#define	PCI_PRODUCT_ATI_RADEON_X1300_4D	0x714d		/* Radeon X1300 */
+#define	PCI_PRODUCT_ATI_RADEON_X1300_4E	0x714e		/* Radeon X1300 */
+#define	PCI_PRODUCT_ATI_RV505_2	0x714f		/* Radeon X1300 */
+#define	PCI_PRODUCT_ATI_RV505_3	0x7151		/* RV505 */
+#define	PCI_PRODUCT_ATI_FIREGL_V3300	0x7152		/* FireGL V3300 */
+#define	PCI_PRODUCT_ATI_FIREGL_V3350	0x7153		/* FireGL V3350 */
+#define	PCI_PRODUCT_ATI_RADEON_X1300_5E	0x715e		/* Radeon X1300 */
+#define	PCI_PRODUCT_ATI_RADEON_X1550_64_2	0x715f		/* Radeon X1550 */
 #define	PCI_PRODUCT_ATI_RADEON_X1600_S	0x7160		/* Radeon X1600 Sec */
+#define	PCI_PRODUCT_ATI_RADEON_X1300X1550	0x7180		/* Radeon X1300/X1550 */
+#define	PCI_PRODUCT_ATI_RADEON_X1600_81	0x7181		/* Radeon X1600 */
 #define	PCI_PRODUCT_ATI_RADEON_X1300PRO	0x7183		/* Radeon X1300 Pro */
+#define	PCI_PRODUCT_ATI_RADEON_X1450	0x7186		/* Radeon X1450 */
 #define	PCI_PRODUCT_ATI_RADEON_X1300	0x7187		/* Radeon X1300 */
+#define	PCI_PRODUCT_ATI_RADEON_X2300	0x7188		/* Radeon Mobility X2300 */
+#define	PCI_PRODUCT_ATI_RADEON_X2300_2	0x718a		/* Radeon Mobility X2300 */
+#define	PCI_PRODUCT_ATI_MOBILITY_X1350	0x718b		/* Radeon Mobility X1350 */
+#define	PCI_PRODUCT_ATI_MOBILITY_X1350_2	0x718c		/* Radeon Mobility X1350 */
+#define	PCI_PRODUCT_ATI_MOBILITY_X1450	0x718d		/* Radeon Mobility X1450 */
+#define	PCI_PRODUCT_ATI_RADEON_X1300_8F	0x718f		/* Radeon X1300 */
+#define	PCI_PRODUCT_ATI_RADEON_X1550_2	0x7193		/* Radeon X1550 */
+#define	PCI_PRODUCT_ATI_MOBILITY_X1350_3	0x7196		/* Radeon Mobility X1350 */
+#define	PCI_PRODUCT_ATI_FIREMV_2250	0x719b		/* FireMV 2250 */
+#define	PCI_PRODUCT_ATI_RADEON_X1550_64_3	0x719f		/* Radeon X1550 64-bit */
 #define	PCI_PRODUCT_ATI_RADEON_X1300PRO_S	0x71a3		/* Radeon X1300 Pro Sec */
 #define	PCI_PRODUCT_ATI_RADEON_X1300_S	0x71a7		/* Radeon X1300 Sec */
+#define	PCI_PRODUCT_ATI_RADEON_X1600_C0	0x71c0		/* Radeon X1600 */
+#define	PCI_PRODUCT_ATI_RADEON_X1650	0x71c1		/* Radeon X1650 */
 #define	PCI_PRODUCT_ATI_RADEON_X1600_PRO	0x71c2		/* Radeon X1600 Pro */
+#define	PCI_PRODUCT_ATI_RADEON_X1600_C3	0x71c3		/* Radeon X1600 */
+#define	PCI_PRODUCT_ATI_FIREGL_V5200	0x71c4		/* FireGL V5200 */
 #define	PCI_PRODUCT_ATI_RADEON_X1600_M	0x71c5		/* Radeon Mobility X1600 */
 #define	PCI_PRODUCT_ATI_RADEON_X1650_PRO	0x71c6		/* Radeon X1650 Pro */
 #define	PCI_PRODUCT_ATI_RADEON_X1650_PRO2	0x71c7		/* Radeon X1650 Pro */
+#define	PCI_PRODUCT_ATI_RADEON_X1600_CD	0x71cd		/* Radeon X1600 */
+#define	PCI_PRODUCT_ATI_RADEON_X1300_XT	0x71ce		/* Radeon X1300 XT */
+#define	PCI_PRODUCT_ATI_FIREGL_V3400	0x71d2		/* FireGL V3400 */
 #define	PCI_PRODUCT_ATI_RV530_M56	0x71d4		/* Mobility FireGL V5250 */
+#define	PCI_PRODUCT_ATI_RADEON_X1700	0x71d5		/* Radeon X1700 */
+#define	PCI_PRODUCT_ATI_RADEON_X1700XT	0x71d6		/* Radeon X1700 XT */
+#define	PCI_PRODUCT_ATI_FIREGL_V5200_1	0x71da		/* FireGL V5200 */
+#define	PCI_PRODUCT_ATI_MOBILITY_X1700	0x71de		/* Radeon Mobility X1700 */
 #define	PCI_PRODUCT_ATI_RADEON_X1600_PRO_S	0x71e2		/* Radeon X1600 Pro Sec */
 #define	PCI_PRODUCT_ATI_RADEON_X1650_PRO_S	0x71e6		/* Radeon X1650 Pro Sec */
 #define	PCI_PRODUCT_ATI_RADEON_X1650_PRO2_S	0x71e7		/* Radeon X1650 Pro Sec */
+#define	PCI_PRODUCT_ATI_RADEON_X2300HD	0x7200		/* Radeon X2300HD */
+#define	PCI_PRODUCT_ATI_MOBILITY_X2300HD	0x7210		/* Radeon Mobility X2300HD */
+#define	PCI_PRODUCT_ATI_MOBILITY_X2300HD_1	0x7211		/* Radeon Mobility X2300HD */
+#define	PCI_PRODUCT_ATI_RADEON_X1950_40	0x7240		/* Radeon X1950 */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_43	0x7243		/* Radeon X1900 */
+#define	PCI_PRODUCT_ATI_RADEON_X1950_44	0x7244		/* Radeon X1950 */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_45	0x7245		/* Radeon X1900 */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_46	0x7246		/* Radeon X1900 */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_47	0x7247		/* Radeon X1900 */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_48	0x7248		/* Radeon X1900 */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_49	0x7249		/* Radeon X1900 */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_4A	0x724a		/* Radeon X1900 */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_4B	0x724b		/* Radeon X1900 */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_4C	0x724c		/* Radeon X1900 */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_4D	0x724d		/* Radeon X1900 */
+#define	PCI_PRODUCT_ATI_STREAM_PROCESSOR	0x724e		/* AMD Stream Processor */
+#define	PCI_PRODUCT_ATI_RADEON_X1900_4F	0x724f		/* Radeon X1900 */
 #define	PCI_PRODUCT_ATI_RADEON_X1950_PRO	0x7280		/* Radeon X1950 Pro */
+#define	PCI_PRODUCT_ATI_RV560	0x7281		/* RV560 */
+#define	PCI_PRODUCT_ATI_RV560_1	0x7283		/* RV560 */
+#define	PCI_PRODUCT_ATI_MOBILITY_X1900	0x7284		/* Radeon Mobility X1900 */
+#define	PCI_PRODUCT_ATI_RV560_2	0x7287		/* RV560 */
+#define	PCI_PRODUCT_ATI_RADEON_X1950GT	0x7288		/* Radeon X1950 GT */
+#define	PCI_PRODUCT_ATI_RV570	0x7289		/* RV570 */
+#define	PCI_PRODUCT_ATI_RV570_2	0x728b		/* RV570 */
+#define	PCI_PRODUCT_ATI_FIREGL_V7400	0x728c		/* FireGL V7400 */
+#define	PCI_PRODUCT_ATI_RV560_3	0x7290		/* Rv560 */
 #define	PCI_PRODUCT_ATI_RADEON_RX1650_XT	0x7291		/* Radeon RX1650 XT */
+#define	PCI_PRODUCT_ATI_RADEON_X1650_1	0x7293		/* Radeon X1650 */
+#define	PCI_PRODUCT_ATI_RV560_4	0x7297		/* RV560 */
 #define	PCI_PRODUCT_ATI_RADEON_X1950_PRO_S	0x72a0		/* Radeon X1950 Pro Sec */
 #define	PCI_PRODUCT_ATI_RADEON_RX1650_XT_2	0x72b1		/* Radeon RX1650 XT Sec */
+#define	PCI_PRODUCT_ATI_RADEON_9000IGP	0x7834		/* Radeon 9000/9100 IGP */
+#define	PCI_PRODUCT_ATI_RADEON_RS350IGP	0x7835		/* Radeon RS350IGP */
 #define	PCI_PRODUCT_ATI_RS690_HB	0x7910		/* RS690 Host */
 #define	PCI_PRODUCT_ATI_RS740_HB	0x7911		/* RS740 Host */
 #define	PCI_PRODUCT_ATI_RS690_PCIE_1	0x7912		/* RS690 PCIE */
@@ -1089,6 +1277,7 @@
 #define	PCI_PRODUCT_ATI_RS690_PCIE_5	0x7917		/* RS690 PCIE */
 #define	PCI_PRODUCT_ATI_RS690_HDA	0x7919		/* RS690 HD Audio */
 #define	PCI_PRODUCT_ATI_RADEON_X1250	0x791e		/* Radeon X1250 */
+#define	PCI_PRODUCT_ATI_RADEON_X1250IGP	0x791e		/* Radeon X1250 IGP */
 #define	PCI_PRODUCT_ATI_RADEON_2100	0x796e		/* Radeon 2100 */
 #define	PCI_PRODUCT_ATI_RADEON_HD4850	0x9442		/* Radeon HD 4850 */
 #define	PCI_PRODUCT_ATI_RADEON_HD2400_XT	0x94c1		/* Radeon HD 2400 XT */
@@ -4079,6 +4268,7 @@
 #define	PCI_PRODUCT_S3_SAVAGE3D	0x8a20		/* Savage 3D */
 #define	PCI_PRODUCT_S3_SAVAGE3D_M	0x8a21		/* Savage 3DM */
 #define	PCI_PRODUCT_S3_SAVAGE4	0x8a22		/* Savage 4 */
+#define	PCI_PRODUCT_S3_SAVAGE4_2	0x8a23		/* Savage 4 */
 #define	PCI_PRODUCT_S3_PROSAVAGE_PM133	0x8a25		/* ProSavage PM133 */
 #define	PCI_PRODUCT_S3_PROSAVAGE_KM133	0x8a26		/* ProSavage KM133 */
 #define	PCI_PRODUCT_S3_VIRGE_MX	0x8c01		/* ViRGE MX */
@@ -4087,10 +4277,19 @@
 #define	PCI_PRODUCT_S3_SAVAGE_MX	0x8c11		/* Savage/MX */
 #define	PCI_PRODUCT_S3_SAVAGE_IXMV	0x8c12		/* Savage/IX-MV */
 #define	PCI_PRODUCT_S3_SAVAGE_IX	0x8c13		/* Savage/IX */
-#define	PCI_PRODUCT_S3_SUPERSAVAGE	0x8c2e		/* SuperSavage */
+#define	PCI_PRODUCT_S3_SUPERSAVAGE_MX128	0x8c22		/* SuperSavage MX/128 */
+#define	PCI_PRODUCT_S3_SUPERSAVAGE_MX64	0x8c24		/* SuperSavage MX/64 */
+#define	PCI_PRODUCT_S3_SUPERSAVAGE_MX64C	0x8c26		/* SuperSavage MX/64C */
+#define	PCI_PRODUCT_S3_SUPERSAVAGE_IX128SDR	0x8c2a		/* SuperSavage IX/128 SDR */
+#define	PCI_PRODUCT_S3_SUPERSAVAGE_IX128DDR	0x8c2b		/* SuperSavage IX/128 DDR */
+#define	PCI_PRODUCT_S3_SUPERSAVAGE_IX64SDR	0x8c2c		/* SuperSavage IX/64 SDR */
+#define	PCI_PRODUCT_S3_SUPERSAVAGE_IX64DDR	0x8c2d		/* SuperSavage IX/64 DDR */
+#define	PCI_PRODUCT_S3_SUPERSAVAGE_IXCSDR	0x8c2e		/* SuperSavage IX/C SDR */
+#define	PCI_PRODUCT_S3_SUPERSAVAGE_IXCDDR	0x8c2f		/* SuperSavage IX/C DDR */
 #define	PCI_PRODUCT_S3_TWISTER	0x8d01		/* Twister */
 #define	PCI_PRODUCT_S3_TWISTER_K	0x8d02		/* Twister-K */
-#define	PCI_PRODUCT_S3_PROSAVAGE_DDR	0x8d04		/* ProSavage DDR */
+#define	PCI_PRODUCT_S3_PROSAVAGE_DDR	0x8d03		/* ProSavage DDR */
+#define	PCI_PRODUCT_S3_PROSAVAGE_DDR_K	0x8d04		/* ProSavage DDR-K */
 #define	PCI_PRODUCT_S3_SONICVIBES	0xca00		/* SonicVibes */
 
 /* SafeNet products */
@@ -4204,6 +4403,7 @@
 #define	PCI_PRODUCT_SIS_965	0x0965		/* 965 ISA */
 #define	PCI_PRODUCT_SIS_966	0x0966		/* 966 ISA */
 #define	PCI_PRODUCT_SIS_968	0x0968		/* 968 ISA */
+#define	PCI_PRODUCT_SIS_5300	0x5300		/* 540 VGA */
 #define	PCI_PRODUCT_SIS_5315	0x5315		/* 530 VGA */
 #define	PCI_PRODUCT_SIS_5511	0x5511		/* 5511 */
 #define	PCI_PRODUCT_SIS_5512	0x5512		/* 5512 */
@@ -4229,6 +4429,7 @@
 #define	PCI_PRODUCT_SIS_7016	0x7016		/* 7016 10/100BaseTX */
 #define	PCI_PRODUCT_SIS_7018	0x7018		/* 7018 Audio */
 #define	PCI_PRODUCT_SIS_7019	0x7019		/* 7019 Audio */
+#define	PCI_PRODUCT_SIS_7300	0x7300		/* 7300 VGA */
 #define	PCI_PRODUCT_SIS_966_HDA	0x7502		/* 966 HD Audio */
 
 /* SMC products */
@@ -4892,6 +5093,7 @@
 
 /* XGI Technology products */
 #define	PCI_PRODUCT_XGI_VOLARI_Z7	0x0020		/* Volari Z7 */
+#define	PCI_PRODUCT_XGI_VOLARI_V3XT	0x0040		/* Volari V3XT */
 
 /* Xircom products */
 #define	PCI_PRODUCT_XIRCOM_X3201_3	0x0002		/* X3201-3 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 16838e92bbd..0683e6aed91 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	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 $	*/
@@ -352,14 +352,26 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Banshee",
 	},
 	{
+	    PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO32000,
+	    "Voodoo3",
+	},
+	{
 	    PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO3,
 	    "Voodoo3",
 	},
 	{
+	    PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO4,
+	    "Voodoo4",
+	},
+	{
 	    PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO5,
 	    "Voodoo5",
 	},
 	{
+	    PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO44200,
+	    "Voodoo4",
+	},
+	{
 	    PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_300SX,
 	    "300SX",
 	},
@@ -1757,41 +1769,97 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M241P,
-	    "Radeon Mobility X600",
+	    "Radeon M241P",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3200,
-	    "FireGL V3200",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X300M24,
+	    "Radeon X300 M24",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M24GL,
+	    "FireGL M24 GL",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_RV380,
-	    "Radeon X600 (RV380)",
+	    "Radeon X600",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3200,
+	    "FireGL V3200",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_RV380_S,
-	    "Radeon X600 (RV380) Sec",
+	    "Radeon X600 Sec",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP320,
+	    "Radeon IGP 320",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP340,
+	    "Radeon IGP 340",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9500PRO,
 	    "Radeon 9500 Pro",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AE9700PRO,
+	    "Radeon AE 9700 Pro",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AF9600TX,
+	    "Radeon AF 9600TX",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_AGZ1,
+	    "FireGL AGZ1",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AH_9800SE,
+	    "Radeon AH 9800 SE",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AI_9800,
+	    "Radeon AI 9800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AJ_9800,
+	    "Radeon AJ 9800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_AKX2,
+	    "FireGL AK X2",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600PRO,
 	    "Radeon 9600 Pro",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600LE,
-	    "Radeon 9600 LE",
+	    "Radeon 9600",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600XT,
-	    "Radeon 9600 XT",
+	    "Radeon 9600",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9550,
 	    "Radeon 9550",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_ATT2,
+	    "FireGL",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9650,
+	    "Radeon 9650",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_AVT2,
+	    "FireGL",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH32,
 	    "Mach32",
 	},
@@ -1816,8 +1884,16 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon 9550 Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP_RS250,
+	    "Radeon IGP",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_BB,
-	    "Radeon 8500 BB",
+	    "Radeon 8500",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_BC,
+	    "Radeon BC R200",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP320M,
@@ -2072,6 +2148,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "SB700 ISA",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_MIGP_RS250,
+	    "Radeon Mobility IGP",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_ET,
 	    "Mach64 ET",
 	},
@@ -2081,35 +2161,35 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GD,
-	    "Mach64 GD",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GI,
-	    "Mach64 GI",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GL,
-	    "Mach64 GL",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GM,
-	    "Mach64 GM",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GN,
-	    "Mach64 GN",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GO,
-	    "Mach64 GO",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GP,
-	    "Mach64 GP",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GQ,
-	    "Mach64 GQ",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGEXL,
@@ -2117,63 +2197,119 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GS,
-	    "Mach64 GS",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GT,
-	    "Mach64 GT",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GU,
-	    "Mach64 GU",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GV,
-	    "Mach64 GV",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GW,
-	    "Mach64 GW",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GX,
-	    "Mach64 GX",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GY,
-	    "Mach64 GY",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GZ,
-	    "Mach64 GZ",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV250,
 	    "Radeon 9000",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IG9000,
+	    "Radeon 9000",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV250_S,
 	    "Radeon 9000 Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_JHX800,
+	    "Radeon X800",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800PRO,
 	    "Radeon X800 Pro",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800SE,
+	    "Radeon X800SE",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT,
+	    "Radeon X800XT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800,
+	    "Radeon X800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_X3256,
+	    "FireGL X3-256",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_M18,
+	    "Radeon Mobility M18",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_JOX800SE,
+	    "Radeon X800 SE",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XTPE,
+	    "Radeon X800 XT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AIW_X800VE,
+	    "Radeon AIW X800 VE",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800PRO_S,
 	    "Radeon X800 Pro Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XT,
+	    "Radeon X850 XT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850SE,
+	    "Radeon X850 SE",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850PRO,
+	    "Radeon X850 Pro",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XTPE,
+	    "Radeon X850 XT PE",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LB,
-	    "Mach64 LB",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LD,
-	    "Mach64 LD",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_LE,
-	    "Rage128 LE",
+	    "Rage128",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_M3,
@@ -2181,11 +2317,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LG,
-	    "Mach64 LG",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LI,
-	    "Mach64 LI",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_1,
@@ -2193,15 +2329,15 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LN,
-	    "Mach64 LN",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LP,
-	    "Mach64 LP",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LQ,
-	    "Mach64 LQ",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_PM,
@@ -2209,31 +2345,43 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64LS,
-	    "Mach64 LS",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M7LW,
-	    "Radeon Mobility M7 LW",
+	    "Radeon Mobility M7",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M7,
+	    "FireGL Mobility 7800 M7",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M6LY,
-	    "Radeon Mobility M6 LY",
+	    "Radeon Mobility M6",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M6LZ,
-	    "Radeon Mobility M6 LZ",
+	    "Radeon Mobility M6",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9LD,
+	    "Radeon Mobility M9",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9Lf,
-	    "Radeon Mobility M9 Lf",
+	    "Radeon Mobility M9",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9Lg,
+	    "Radeon Mobility M9",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_MF,
-	    "Rage 128 Mobility MF",
+	    "Rage 128 Mobility",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_ML,
-	    "Rage 128 Mobility ML",
+	    "Rage 128 Mobility",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R300,
@@ -2244,20 +2392,52 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon 9500 Pro",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9800XT,
-	    "Radeon 9800 XT",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON9600TX,
+	    "Radeon 9600 TX",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_X1,
+	    "FireGL X1",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R350,
 	    "Radeon 9800 Pro",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON9800,
+	    "RAdeon 9800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9800XT,
+	    "Radeon 9800 XT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_X2,
+	    "FireGL X2",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350,
-	    "Radeon Mobility M10 NP",
+	    "Radeon Mobility M10",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350NQ,
+	    "Radeon Mobility M10",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350NR,
+	    "Radeon Mobility M10",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350NS,
+	    "Radeon Mobility M10",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350_WS,
-	    "Radeon Mobility M10 NT",
+	    "Radeon Mobility M10",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_9550,
+	    "Radeon Mobility 9550",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R300_S,
@@ -2268,16 +2448,100 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon 9800 Pro Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PA,
+	    "Rage 128 Pro",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PB,
+	    "Rage 128 Pro",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PC,
+	    "Rage 128 Pro",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PD,
-	    "Rage 128 Pro PD",
+	    "Rage 128 Pro",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PE,
+	    "Rage 128 Pro",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_FURY,
 	    "Rage Fury",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PG,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PH,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PI,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PJ,
+	    "Rage 128",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PK,
-	    "Rage 128 PK",
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PL,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PM,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PN,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PO,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PP,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PQ,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PR,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PS,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PT,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PU,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PV,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PW,
+	    "Rage 128",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PX,
+	    "Rage 128 PX",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AIW,
@@ -2285,43 +2549,51 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QE,
-	    "Radeon QE",
+	    "Radeon",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QF,
-	    "Radeon QF",
+	    "Radeon",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QG,
-	    "Radeon QG",
+	    "Radeon",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QH,
+	    "Radeon",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_QL,
-	    "Radeon 8500 QL",
+	    "Radeon 8500",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_QM,
-	    "Radeon 9100 QM",
+	    "Radeon 9100",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_QN,
-	    "Radeon 8500 QN",
+	    "Radeon 8500",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_QO,
-	    "Radeon 8500 QO",
+	    "Radeon 8500",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV200_QW,
-	    "Radeon 7500 QW",
+	    "Radeon 7500",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV200_QX,
+	    "Radeon 7500",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QY,
-	    "Radeon VE QY",
+	    "Radeon VE",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QZ,
-	    "Radeon VE QZ",
+	    "Radeon VE",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_ES1000,
@@ -2329,11 +2601,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_Ql,
-	    "Radeon 8500 Ql",
+	    "Radeon 8500",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_GL,
-	    "Rage 128 GL",
+	    "Rage 128",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_MAGNUM,
@@ -2341,31 +2613,31 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_RG,
-	    "Rage 128 RG",
+	    "Rage 128",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_RK,
-	    "Rage 128 RK",
+	    "Rage 128",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_VR,
-	    "Rage 128 VR",
+	    "Rage 128",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_SH,
-	    "Rage 128 SH",
+	    "Rage 128",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_SK,
-	    "Rage 128 SK",
+	    "Rage 128",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_SL,
-	    "Rage 128 SL",
+	    "Rage 128",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_SM,
-	    "Rage 128 SM",
+	    "Rage 128",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128,
@@ -2373,27 +2645,91 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_TF,
-	    "Rage 128 Pro TF",
+	    "Rage 128 Pro",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_TL,
-	    "Rage 128 Pro TL",
+	    "Rage 128 Pro",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_TR,
-	    "Rage 128 Pro TR",
+	    "Rage 128 Pro",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M300_M22,
 	    "Radeon Mobility M300 M22",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_M24C,
+	    "Radeon Mobility X600 M24C",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M44,
+	    "FireGL M44 GL 5464",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_RV423,
+	    "Radeon X800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800PRORV423,
+	    "Radeon X800 Pro",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT_RV423,
+	    "Radeon X800 XT PE",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800SE_RV423,
+	    "Radeon X800 SE",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XTPRV430,
+	    "Radeon X800 XTP",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XL_RV430,
+	    "Radeon X800 XL",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800SE_RV430,
+	    "Radeon X800 SE",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_RV430,
-	    "Radeon X800 (RV430)",
+	    "Radeon X800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7100_RV423,
+	    "FireGL V7100",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5100_RV423,
+	    "FireGL V5100",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_UR_RV423,
+	    "FireGL",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_UT_RV423,
+	    "FireGL",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_RV430_S,
-	    "Radeon X800 (RV430) Sec",
+	    "Radeon X800 Sec",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5000_M26,
+	    "Mobility FireGL V5000 M26",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5000_M26b,
+	    "Mobility FireGL V5000 M26",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700XL_M26,
+	    "Radeon Mobility X700 XL M26",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700_M26_1,
@@ -2405,15 +2741,19 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_VT,
-	    "Mach64 VT",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_VU,
-	    "Mach64 VU",
+	    "Mach64",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_VV,
-	    "Mach64 VV",
+	    "Mach64",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X550XTX,
+	    "Radeon X550XTX",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RS300_100_HB,
@@ -2432,6 +2772,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon IGP 9100 Host",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP9100_IGP,
+	    "Radeon IGP 9100",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP9100,
 	    "Radeon Mobility IGP 9100",
 	},
@@ -2492,6 +2836,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon 9200 SE Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2200,
+	    "FireMV 2200",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_ES1000_1,
+	    "ES1000",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS482,
 	    "Radeon XPRESS 200",
 	},
@@ -2572,12 +2924,16 @@ static const struct pci_known_product pci_known_products[] = {
 	    "FireGL V3100",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2200_5B65,
+	    "FireMV 2200 5B65",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X300_S,
 	    "Radeon X300 Sec",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_RV370_S,
-	    "Radeon X600 (RV370) Sec",
+	    "Radeon X600 Sec",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X550_S,
@@ -2593,25 +2949,81 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9PLUS,
-	    "Radeon Mobility 9200 (M9+)",
+	    "Radeon Mobility 9200",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_SE,
 	    "Radeon 9200 SE",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT_M28,
+	    "Radeon X800 XT M28",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5100_M28,
+	    "FireGL V5100 M28",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X800_M28,
+	    "Radeon Mobility X800 M28",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850_R480,
+	    "Radeon X850",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XTPER480,
+	    "Radeon X850 XT PE",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850SE_R480,
+	    "Radeon X850 SE",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_GTO,
-	    "Radeon X800 GTO",
+	    "Radeon X800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_R480,
+	    "FireGL R480",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XT_R480,
+	    "Radeon X850XT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT_R423,
+	    "Radeon X800XT",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_GTO_S,
 	    "Radeon X800 GTO Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5000_R410,
+	    "FireGL V5000",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700XT_R410,
+	    "FireGL X700 XT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700PRO_R410,
+	    "FireGL X700 Pro",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700SE_R410,
+	    "FireGL X700 SE",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700_PCIE,
 	    "Radeon X700 PCIE",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700SE_PCIE,
+	    "Radeon X700 SE PCIE",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700_PCIE_S,
 	    "Radeon X700 PCIE Sec",
 	},
@@ -2632,34 +3044,206 @@ static const struct pci_known_product pci_known_products[] = {
 	    "RS200 PCI",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800,
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800A,
 	    "Radeon X1800",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800XT,
+	    "Radeon X1800 XT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1800,
+	    "Radeon Mobility X1800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M_V7200,
+	    "FireGL Mobility V7200",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7200,
+	    "FireGL V7200",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5300,
+	    "FireGL V5300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M_V7100,
+	    "FireGL Mobility V7100",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800B,
+	    "Radeon X1800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800C,
+	    "Radeon X1800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800D,
+	    "Radeon X1800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800E,
+	    "Radeon X1800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800F,
+	    "Radeon X1800",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7300,
+	    "FireGL V7300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7350,
+	    "FireGL V7350",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600,
 	    "Radeon X1600",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV505_1,
+	    "RV505",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_X1550,
+	    "Radeon X1300/X1550",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550,
+	    "Radeon X1550",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_M54_GL,
+	    "M54-GL",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1400,
 	    "Radeon Mobility X1400",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_X1300,
+	    "Radeon X1300/X1550",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_64,
+	    "RADEON X1550 64-bit",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_M52,
 	    "Radeon Mobility X1300 M52-64",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1300_4A,
+	    "Radeon Mobility X1300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1300_4B,
+	    "Radeon Mobility X1300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1300_4C,
+	    "Radeon Mobility X1300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_4D,
+	    "Radeon X1300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_4E,
+	    "Radeon X1300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV505_2,
+	    "Radeon X1300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV505_3,
+	    "RV505",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3300,
+	    "FireGL V3300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3350,
+	    "FireGL V3350",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_5E,
+	    "Radeon X1300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_64_2,
+	    "Radeon X1550",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_S,
 	    "Radeon X1600 Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300X1550,
+	    "Radeon X1300/X1550",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_81,
+	    "Radeon X1600",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300PRO,
 	    "Radeon X1300 Pro",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1450,
+	    "Radeon X1450",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300,
 	    "Radeon X1300",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X2300,
+	    "Radeon Mobility X2300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X2300_2,
+	    "Radeon Mobility X2300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1350,
+	    "Radeon Mobility X1350",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1350_2,
+	    "Radeon Mobility X1350",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1450,
+	    "Radeon Mobility X1450",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_8F,
+	    "Radeon X1300",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_2,
+	    "Radeon X1550",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1350_3,
+	    "Radeon Mobility X1350",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2250,
+	    "FireMV 2250",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_64_3,
+	    "Radeon X1550 64-bit",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300PRO_S,
 	    "Radeon X1300 Pro Sec",
 	},
@@ -2668,10 +3252,26 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon X1300 Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_C0,
+	    "Radeon X1600",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1650,
+	    "Radeon X1650",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_PRO,
 	    "Radeon X1600 Pro",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_C3,
+	    "Radeon X1600",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5200,
+	    "FireGL V5200",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_M,
 	    "Radeon Mobility X1600",
 	},
@@ -2684,10 +3284,38 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon X1650 Pro",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_CD,
+	    "Radeon X1600",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_XT,
+	    "Radeon X1300 XT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3400,
+	    "FireGL V3400",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV530_M56,
 	    "Mobility FireGL V5250",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1700,
+	    "Radeon X1700",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1700XT,
+	    "Radeon X1700 XT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5200_1,
+	    "FireGL V5200",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1700,
+	    "Radeon Mobility X1700",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_PRO_S,
 	    "Radeon X1600 Pro Sec",
 	},
@@ -2700,14 +3328,126 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon X1650 Pro Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X2300HD,
+	    "Radeon X2300HD",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X2300HD,
+	    "Radeon Mobility X2300HD",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X2300HD_1,
+	    "Radeon Mobility X2300HD",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950_40,
+	    "Radeon X1950",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_43,
+	    "Radeon X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950_44,
+	    "Radeon X1950",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_45,
+	    "Radeon X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_46,
+	    "Radeon X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_47,
+	    "Radeon X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_48,
+	    "Radeon X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_49,
+	    "Radeon X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4A,
+	    "Radeon X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4B,
+	    "Radeon X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4C,
+	    "Radeon X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4D,
+	    "Radeon X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_STREAM_PROCESSOR,
+	    "AMD Stream Processor",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4F,
+	    "Radeon X1900",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950_PRO,
 	    "Radeon X1950 Pro",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560,
+	    "RV560",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_1,
+	    "RV560",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1900,
+	    "Radeon Mobility X1900",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_2,
+	    "RV560",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950GT,
+	    "Radeon X1950 GT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV570,
+	    "RV570",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV570_2,
+	    "RV570",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7400,
+	    "FireGL V7400",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_3,
+	    "Rv560",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RX1650_XT,
 	    "Radeon RX1650 XT",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1650_1,
+	    "Radeon X1650",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_4,
+	    "RV560",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950_PRO_S,
 	    "Radeon X1950 Pro Sec",
 	},
@@ -2716,6 +3456,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon RX1650 XT Sec",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9000IGP,
+	    "Radeon 9000/9100 IGP",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS350IGP,
+	    "Radeon RS350IGP",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RS690_HB,
 	    "RS690 Host",
 	},
@@ -2752,6 +3500,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Radeon X1250",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1250IGP,
+	    "Radeon X1250 IGP",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_2100,
 	    "Radeon 2100",
 	},
@@ -13316,6 +14068,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Savage 4",
 	},
 	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE4_2,
+	    "Savage 4",
+	},
+	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_PROSAVAGE_PM133,
 	    "ProSavage PM133",
 	},
@@ -13348,8 +14104,40 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Savage/IX",
 	},
 	{
-	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE,
-	    "SuperSavage",
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_MX128,
+	    "SuperSavage MX/128",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_MX64,
+	    "SuperSavage MX/64",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_MX64C,
+	    "SuperSavage MX/64C",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX128SDR,
+	    "SuperSavage IX/128 SDR",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX128DDR,
+	    "SuperSavage IX/128 DDR",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX64SDR,
+	    "SuperSavage IX/64 SDR",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX64DDR,
+	    "SuperSavage IX/64 DDR",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IXCSDR,
+	    "SuperSavage IX/C SDR",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IXCDDR,
+	    "SuperSavage IX/C DDR",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_TWISTER,
@@ -13364,6 +14152,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "ProSavage DDR",
 	},
 	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_PROSAVAGE_DDR_K,
+	    "ProSavage DDR-K",
+	},
+	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_SONICVIBES,
 	    "SonicVibes",
 	},
@@ -13736,6 +14528,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "968 ISA",
 	},
 	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5300,
+	    "540 VGA",
+	},
+	{
 	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5315,
 	    "530 VGA",
 	},
@@ -13836,6 +14632,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "7019 Audio",
 	},
 	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_7300,
+	    "7300 VGA",
+	},
+	{
 	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_966_HDA,
 	    "966 HD Audio",
 	},
@@ -16104,6 +16904,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Volari Z7",
 	},
 	{
+	    PCI_VENDOR_XGI, PCI_PRODUCT_XGI_VOLARI_V3XT,
+	    "Volari V3XT",
+	},
+	{
 	    PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_X3201_3,
 	    "X3201-3",
 	},