Remove the strings from the pcidevs arrays. they are no longer needed and are

just wasting space.

9 files changed, 571 insertions, 365 deletions

diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index 6d41848b55c..d2ffdb634a4 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -265,7 +265,6 @@ typedef struct drm_pci_id_list
 	int vendor;
 	int device;
 	long driver_private;
-	char *name;
 } drm_pci_id_list_t;
 
 struct drm_file;
diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c
index b3cdaa935e0..0148f823798 100644
--- a/sys/dev/pci/drm/i915_drv.c
+++ b/sys/dev/pci/drm/i915_drv.c
@@ -39,30 +39,36 @@ void	i915drm_attach(struct device *, struct device *, void *);
 int	inteldrm_ioctl(struct drm_device *, u_long, caddr_t, struct drm_file *);
 
 static drm_pci_id_list_t i915_pciidlist[] = {
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830M_IGD, CHIP_I8XX, "Intel i830M GMCH"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82845G_IGD, CHIP_I8XX, "Intel i845G GMCH"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_IGD, CHIP_I8XX, "Intel i852GM/i855GM GMCH"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865G_IGD, CHIP_I8XX, "Intel i865G GMCH"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_IGD_1, CHIP_I9XX|CHIP_I915, "Intel i915G"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7221_IGD, CHIP_I9XX|CHIP_I915, "Intel E7221 (i915)"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_IGD_1, CHIP_I9XX|CHIP_I915, "Intel i915GM"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945G_IGD_1, CHIP_I9XX|CHIP_I915, "Intel i945G"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_IGD_1, CHIP_I9XX|CHIP_I915, "Intel i945GM"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GME_IGD_1, CHIP_I9XX|CHIP_I915, "Intel i945GME"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82946GZ_IGD_1, CHIP_I9XX|CHIP_I965, "Intel i946GZ"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G35_IGD_1, CHIP_I9XX|CHIP_I965, "Intel i965G"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_IGD_1, CHIP_I9XX|CHIP_I965, "Intel i965Q"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_IGD_1, CHIP_I9XX|CHIP_I965, "Intel i965G"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM965_IGD_1, CHIP_I9XX|CHIP_I965, "Intel i965GM"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GME965_IGD_1, CHIP_I9XX|CHIP_I965, "Intel i965GME/GLE"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_IGD_1, CHIP_I9XX|CHIP_I915, "Intel G33"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q35_IGD_1, CHIP_I9XX|CHIP_I915, "Intel Q35"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q33_IGD_1, CHIP_I9XX|CHIP_I915, "Intel Q33"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM45_IGD_1, CHIP_I9XX|CHIP_I965, "Mobile Intel GM45 Express Chipset"},
-	{PCI_VENDOR_INTEL, 0x2E02, CHIP_I9XX|CHIP_I965, "Intel Integrated Graphics Device"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q45_IGD_1, CHIP_I9XX|CHIP_I965, "Intel Q45/Q43"},
-	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G45_IGD_1, CHIP_I9XX|CHIP_I965, "Intel G45/G43"},
-	{0, 0, 0, NULL}
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830M_IGD, CHIP_I8XX},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82845G_IGD, CHIP_I8XX},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_IGD, CHIP_I8XX},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865G_IGD, CHIP_I8XX},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_IGD_1, CHIP_I9XX|CHIP_I915},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7221_IGD, CHIP_I9XX|CHIP_I915},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_IGD_1,
+	    CHIP_I9XX|CHIP_I915},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945G_IGD_1, CHIP_I9XX|CHIP_I915},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_IGD_1,
+	    CHIP_I9XX|CHIP_I915},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GME_IGD_1,
+	    CHIP_I9XX|CHIP_I915},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82946GZ_IGD_1,
+	    CHIP_I9XX|CHIP_I965},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G35_IGD_1, CHIP_I9XX|CHIP_I965},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_IGD_1, CHIP_I9XX|CHIP_I965},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_IGD_1, CHIP_I9XX|CHIP_I965},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM965_IGD_1,
+	    CHIP_I9XX|CHIP_I965},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GME965_IGD_1,
+	    CHIP_I9XX|CHIP_I965},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_IGD_1, CHIP_I9XX|CHIP_I915},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q35_IGD_1, CHIP_I9XX|CHIP_I915},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q33_IGD_1, CHIP_I9XX|CHIP_I915},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM45_IGD_1, CHIP_I9XX|CHIP_I965},
+	{PCI_VENDOR_INTEL, 0x2E02, CHIP_I9XX|CHIP_I965},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q45_IGD_1, CHIP_I9XX|CHIP_I965},
+	{PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G45_IGD_1, CHIP_I9XX|CHIP_I965},
+	{0, 0, 0}
 };
 
 static const struct drm_driver_info i915_driver = {
diff --git a/sys/dev/pci/drm/mach64_drv.c b/sys/dev/pci/drm/mach64_drv.c
index 189cb6a71d6..65e777a7780 100644
--- a/sys/dev/pci/drm/mach64_drv.c
+++ b/sys/dev/pci/drm/mach64_drv.c
@@ -43,27 +43,27 @@ void	mach64drm_attach(struct device *, struct device *, void *);
 int	machdrm_ioctl(struct drm_device *, u_long, caddr_t, struct drm_file *);
 
 static drm_pci_id_list_t mach64_pciidlist[] = {
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GI, 0, "3D Rage Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GP, 0, "3D Rage Pro 215GP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GQ, 0, "3D Rage Pro 215GQ"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGEPRO, 0, "3D Rage Pro AGP 1X/2X"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GD, 0, "3D Rage Pro AGP 1X"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LI, 0, "3D Rage LT Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LP, 0, "3D Rage LT Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LQ, 0, "3D Rage LT Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LB, 0, "3D Rage LT Pro AGP-133"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LD, 0, "3D Rage LT Pro AGP-66"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GL, 0, "Rage XC"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GO, 0, "Rage XL"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGEXL, 0, "Rage XL"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GS, 0, "Rage XC"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GM, 0, "Rage XL AGP 2X"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GN, 0, "Rage XC AGP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_PM, 0, "Rage Mobility P/M"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64LS, 0, "Rage Mobility L"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_1, 0, "Rage Mobility P/M AGP 2X"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LN, 0, "Rage Mobility L AGP 2X"},
-	{0, 0, 0, NULL}
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GI},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GQ},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGEPRO},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GD},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LI},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LQ},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LB},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LD},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GL},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GO},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGEXL},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GS},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GM},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GN},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_PM},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64LS},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_1},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_LN},
+	{0, 0, 0}
 };
 
 static const struct drm_driver_info mach64_driver = {
diff --git a/sys/dev/pci/drm/mga_drv.c b/sys/dev/pci/drm/mga_drv.c
index 2fa4b5b7a26..19d4f799179 100644
--- a/sys/dev/pci/drm/mga_drv.c
+++ b/sys/dev/pci/drm/mga_drv.c
@@ -42,11 +42,15 @@ int	mga_driver_device_is_agp(struct drm_device * );
 int	mgadrm_ioctl(struct drm_device *, u_long, caddr_t, struct drm_file *);
 
 static drm_pci_id_list_t mga_pciidlist[] = {
-	{PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G200_PCI, MGA_CARD_TYPE_G200, "Matrox G200 (PCI)"},
-	{PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G200_AGP, MGA_CARD_TYPE_G200, "Matrox G200 (AGP)"},
-	{PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G400_AGP, MGA_CARD_TYPE_G400, "Matrox G400/G450 (AGP)"},
-	{PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G550_AGP, MGA_CARD_TYPE_G550, "Matrox G550 (AGP)"},
-	{0, 0, 0, NULL}
+	{PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G200_PCI,
+	    MGA_CARD_TYPE_G200},
+	{PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G200_AGP,
+	    MGA_CARD_TYPE_G200},
+	{PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G400_AGP,
+	    MGA_CARD_TYPE_G400},
+	{PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G550_AGP,
+	    MGA_CARD_TYPE_G550},
+	{0, 0, 0}
 };
 
 /**
diff --git a/sys/dev/pci/drm/r128_drv.c b/sys/dev/pci/drm/r128_drv.c
index 57a677394e5..37a91a9074c 100644
--- a/sys/dev/pci/drm/r128_drv.c
+++ b/sys/dev/pci/drm/r128_drv.c
@@ -41,44 +41,44 @@ void	r128drm_attach(struct device *, struct device *, void *);
 int	ragedrm_ioctl(struct drm_device *, u_long, caddr_t, struct drm_file *);
 
 static drm_pci_id_list_t r128_pciidlist[] = {
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_LE, 0, "ATI Rage 128 Mobility LE (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_M3, 0, "ATI Rage 128 Mobility LF (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_MF, 0, "ATI Rage 128 Mobility MF (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_ML, 0, "ATI Rage 128 Mobility ML (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PA, 0, "ATI Rage 128 Pro PA (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PB, 0, "ATI Rage 128 Pro PB (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PC, 0, "ATI Rage 128 Pro PC (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PD, 0, "ATI Rage 128 Pro PD (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PE, 0, "ATI Rage 128 Pro PE (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_FURY, 0, "ATI Rage 128 Pro PF (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PG, 0, "ATI Rage 128 Pro PG (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PH, 0, "ATI Rage 128 Pro PH (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PI, 0, "ATI Rage 128 Pro PI (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PJ, 0, "ATI Rage 128 Pro PJ (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PK, 0, "ATI Rage 128 Pro PK (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PL, 0, "ATI Rage 128 Pro PL (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PM, 0, "ATI Rage 128 Pro PM (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PN, 0, "ATI Rage 128 Pro PN (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PO, 0, "ATI Rage 128 Pro PO (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PP, 0, "ATI Rage 128 Pro PP (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PQ, 0, "ATI Rage 128 Pro PQ (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PR, 0, "ATI Rage 128 Pro PR (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PS, 0, "ATI Rage 128 Pro PS (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PT, 0, "ATI Rage 128 Pro PT (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PU, 0, "ATI Rage 128 Pro PU (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PV, 0, "ATI Rage 128 Pro PV (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PW, 0, "ATI Rage 128 Pro PW (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PX, 0, "ATI Rage 128 Pro PX (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_GL, 0, "ATI Rage 128 RE (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_MAGNUM, 0, "ATI Rage 128 RF (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_RG, 0, "ATI Rage 128 RG (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_RK, 0, "ATI Rage 128 RK (PCI)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_VR, 0, "ATI Rage 128 RL (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_SM, 0, "ATI Rage 128 SM (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_TF, 0, "ATI Rage 128 Pro Ultra TF (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_TL, 0, "ATI Rage 128 Pro Ultra TL (AGP)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_TR, 0, "ATI Rage 128 Pro Ultra TR (AGP)"},
-	{0, 0, 0, NULL}
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_LE},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_M3},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_MF},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_ML},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PA},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PB},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PC},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PD},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PE},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_FURY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PG},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PH},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PI},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PJ},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PK},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PL},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PM},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PN},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PO},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PQ},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PR},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PS},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PT},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PU},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PV},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PW},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_PX},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_GL},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_MAGNUM},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_RG},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_RK},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_VR},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_SM},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_TF},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_TL},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE128_TR},
+	{0, 0, 0}
 };
 
 static const struct drm_driver_info r128_driver = {
diff --git a/sys/dev/pci/drm/radeon_drv.c b/sys/dev/pci/drm/radeon_drv.c
index c95fbaa047d..486ad58be1f 100644
--- a/sys/dev/pci/drm/radeon_drv.c
+++ b/sys/dev/pci/drm/radeon_drv.c
@@ -41,243 +41,438 @@ int	radeondrm_ioctl(struct drm_device *, u_long, caddr_t, struct drm_file *);
 int radeon_no_wb;
 
 static drm_pci_id_list_t radeon_pciidlist[] = {
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M241P, CHIP_RV380|RADEON_IS_MOBILITY, "ATI Radeon Mobility X600 M24"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X300M24, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Radeon Mobility X300 M24"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M24GL, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI FireGL M24 GL"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_RV380, CHIP_RV380|RADEON_NEW_MEMMAP, "ATI Radeon RV380 X600"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3200, CHIP_RV380|RADEON_NEW_MEMMAP, "ATI FireGL V3200 RV380"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP320, CHIP_RS100|RADEON_IS_IGP, "ATI Radeon RS100 IGP 320"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP340, CHIP_RS200|RADEON_IS_IGP, "ATI Radeon RS200 IGP 340"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9500PRO, CHIP_R300, "ATI Radeon AD 9500"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AE9700PRO, CHIP_R300, "ATI Radeon AE 9700 Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AF9600TX, CHIP_R300, "ATI Radeon AF R300 9600TX"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_AGZ1, CHIP_R300, "ATI FireGL AG Z1"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AH_9800SE, CHIP_R350, "ATI Radeon AH 9800 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AI_9800, CHIP_R350, "ATI Radeon AI 9800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AJ_9800, CHIP_R350, "ATI Radeon AJ 9800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_AKX2, CHIP_R350, "ATI FireGL AK X2"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600PRO, CHIP_RV350, "ATI Radeon AP 9600"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600LE, CHIP_RV350, "ATI Radeon AQ 9600 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600XT, CHIP_RV350, "ATI Radeon AR 9600 XT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9550, CHIP_RV350, "ATI Radeon AS 9550"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_ATT2, CHIP_RV350, "ATI FireGL AT T2"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9650, CHIP_RV350, "ATI Radeon 9650"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_AVT2, CHIP_RV350, "ATI FireGL AV RV360 T2"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP_RS250, CHIP_RS200|RADEON_IS_IGP, "ATI Radeon RS250 IGP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_BB, CHIP_R200, "ATI Radeon BB R200 AIW 8500DV"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_BC, CHIP_R200, "ATI Radeon BC R200"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP320M, CHIP_RS100|RADEON_IS_IGP|RADEON_IS_MOBILITY, "ATI Radeon RS100 Mobility U1"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_M6, CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY, "ATI Radeon RS200 Mobility IGP 340M"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_MIGP_RS250, CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY, "ATI Radeon RS250 Mobility IGP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV250, CHIP_RV250, "ATI Radeon If RV250 9000"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IG9000, CHIP_RV250, "ATI Radeon Ig RV250 9000"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_JHX800, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon JH R420 X800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800PRO, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon JI R420 X800 Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800SE, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon JJ R420 X800 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon JK R420 X800 XT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon JL R420 X800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_X3256, CHIP_R420|RADEON_NEW_MEMMAP, "ATI FireGL JM X3-256"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_M18, CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Radeon JN R420 Mobility M18"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_JOX800SE, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon JO R420 X800 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XTPE, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon JP R420 X800 XT PE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AIW_X800VE, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon JT R420 AIW X800 VE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XT, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon R481 X850 XT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850SE, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon R481 X850 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850PRO, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon R481 X850 Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XTPE, CHIP_R420|RADEON_NEW_MEMMAP, "ATI Radeon R481 X850 XT PE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M7LW, CHIP_RV200|RADEON_IS_MOBILITY, "ATI Radeon LW RV200 Mobility 7500 M7"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M7, CHIP_RV200|RADEON_IS_MOBILITY, "ATI Radeon LX RV200 Mobility FireGL 7800 M7"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M6LY, CHIP_RV100|RADEON_IS_MOBILITY, "ATI Radeon LY RV100 Mobility M6"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M6LZ, CHIP_RV100|RADEON_IS_MOBILITY, "ATI Radeon LZ RV100 Mobility M6"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9LD, CHIP_RV250|RADEON_IS_MOBILITY, "ATI Radeon Ld RV250 Mobility 9000 M9"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9Lf, CHIP_RV250, "ATI Radeon Lf RV250 Mobility 9000 M9 / FireMV 2400 PCI"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9Lg, CHIP_RV250|RADEON_IS_MOBILITY, "ATI Radeon Lg RV250 Mobility 9000 M9"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R300, CHIP_R300, "ATI Radeon ND R300 9700 Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON9500_PRO, CHIP_R300, "ATI Radeon NE R300 9500 Pro / 9700"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON9600TX, CHIP_R300, "ATI Radeon NF R300 9600TX"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_X1, CHIP_R300, "ATI Radeon NG R300 FireGL X1"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R350, CHIP_R350, "ATI Radeon NH R350 9800 Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON9800, CHIP_R350, "ATI Radeon NI R350 9800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9800XT, CHIP_R350, "ATI Radeon NJ R360 9800 XT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_X2, CHIP_R350, "ATI FireGL NK X2"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350, CHIP_RV350|RADEON_IS_MOBILITY, "ATI Radeon RV350 Mobility 9600 M10 NP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350NQ, CHIP_RV350|RADEON_IS_MOBILITY, "ATI Radeon RV350 Mobility 9600 M10 NQ"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350NR, CHIP_RV350|RADEON_IS_MOBILITY, "ATI Radeon RV350 Mobility 9600 M11 NR"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350NS, CHIP_RV350|RADEON_IS_MOBILITY, "ATI Radeon RV350 Mobility 9600 M10 NS"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350_WS, CHIP_RV350|RADEON_IS_MOBILITY, "ATI FireGL T2/T2e"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_9550, CHIP_RV350|RADEON_IS_MOBILITY, "ATI Radeon Mobility 9550"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AIW, CHIP_R100|RADEON_SINGLE_CRTC, "ATI Radeon QD R100"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QE, CHIP_R100|RADEON_SINGLE_CRTC, "ATI Radeon QE R100"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QF, CHIP_R100|RADEON_SINGLE_CRTC, "ATI Radeon QF R100"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QG, CHIP_R100|RADEON_SINGLE_CRTC, "ATI Radeon QG R100"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QH, CHIP_R200, "ATI Radeon QH R200 8500"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_QL, CHIP_R200, "ATI Radeon QL R200 8500 LE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_QM, CHIP_R200, "ATI Radeon QM R200 9100"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV200_QW, CHIP_RV200, "ATI Radeon QW RV200 7500"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV200_QX, CHIP_RV200, "ATI Radeon QX RV200 7500"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QY, CHIP_RV100, "ATI Radeon QY RV100 7000/VE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QZ, CHIP_RV100, "ATI Radeon QZ RV100 7000/VE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_ES1000_1, CHIP_RV100, "ATI ES1000 RN50"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M300_M22, CHIP_RV380|RADEON_IS_MOBILITY, "ATI Radeon Mobility X300 M22"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_M24C, CHIP_RV380|RADEON_IS_MOBILITY, "ATI Radeon Mobility X600 SE M24C"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M44, CHIP_RV380|RADEON_IS_MOBILITY, "ATI FireGL M22 GL 5464"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_RV423, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R423 X800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800PRORV423, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R423 X800 Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT_RV423, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R423 X800 XT PE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800SE_RV423, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R423 X800 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XTPRV430, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R430 X800 XTP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XL_RV430, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R430 X800 XL"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800SE_RV430, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R430 X800 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_RV430, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R430 X800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7100_RV423, CHIP_R423|RADEON_NEW_MEMMAP, "ATI FireGL V7100 R423"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5100_RV423, CHIP_R423|RADEON_NEW_MEMMAP, "ATI FireGL V5100 R423 UQ"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_UR_RV423, CHIP_R423|RADEON_NEW_MEMMAP, "ATI FireGL unknown R423 UR"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_UT_RV423, CHIP_R423|RADEON_NEW_MEMMAP, "ATI FireGL unknown R423 UT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5000_M26, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility FireGL V5000 M26"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5000_M26b, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility FireGL V5000 M26"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700XL_M26, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Radeon Mobility X700 XL M26"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700_M26_1, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Radeon Mobility X700 M26"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700_M26_2, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Radeon Mobility X700 M26"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X550XTX, CHIP_RV410|RADEON_NEW_MEMMAP, "ATI Radeon X550XTX"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP9100_IGP, CHIP_RS300|RADEON_IS_IGP, "ATI Radeon RS300 9100 IGP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP9100, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY, "ATI Radeon RS300 Mobility IGP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS480, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_IGPGART, "ATI RS480 XPRESS 200G"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS480_B, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART, "ATI Radeon XPRESS 200M 5955"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS482, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART, "ATI Radeon RS482 XPRESS 200"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS482_B, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART, "ATI Radeon RS485 XPRESS 1100 IGP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_PRO, CHIP_RV280, "ATI Radeon RV280 9250"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280, CHIP_RV280, "ATI Radeon RV280 9200"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_B, CHIP_RV280, "ATI Radeon RV280 9200"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_SE_S, CHIP_RV280, "ATI Radeon RV280 9200 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2200, CHIP_RV280, "ATI FireMV 2200 PCI"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_ES1000, CHIP_RV100, "ATI ES1000 RN50"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS400, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_IGPGART, "ATI Radeon XPRESS 200 5A41 (PCIE)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS400_B, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART, "ATI Radeon XPRESS 200M 5A42 (PCIE)"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RC410, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_IGPGART, "ATI Radeon RC410 XPRESS 200"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RC410_B, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART, "ATI Radeon RC410 XPRESS 200M"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X300, CHIP_RV380|RADEON_NEW_MEMMAP, "ATI Radeon RV370 X300 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_RV370, CHIP_RV380|RADEON_NEW_MEMMAP, "ATI Radeon RV370 X600 Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X550, CHIP_RV380|RADEON_NEW_MEMMAP, "ATI Radeon RV370 X550"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_RV370, CHIP_RV380|RADEON_NEW_MEMMAP, "ATI FireGL V3100 (RV370) 5B64"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2200_5B65, CHIP_RV380|RADEON_NEW_MEMMAP, "ATI FireMV 2200 PCIE (RV370) 5B65"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_M, CHIP_RV280|RADEON_IS_MOBILITY, "ATI Radeon RV280 Mobility"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9PLUS, CHIP_RV280|RADEON_IS_MOBILITY, "ATI Radeon RV280 Mobility"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT_M28, CHIP_R423|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X800 XT M28"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5100_M28, CHIP_R423|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility FireGL V5100 M28"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X800_M28, CHIP_R423|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X800 M28"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850_R480, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R480 X850"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XTPER480, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R480 X850 XT PE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850SE_R480, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R480 X850 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_GTO, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R480 X850 Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_R480, CHIP_R423|RADEON_NEW_MEMMAP, "ATI unknown Radeon / FireGL R480"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XT_R480, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R480 X850 XT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT_R423, CHIP_R423|RADEON_NEW_MEMMAP, "ATI Radeon R423 X800 XT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5000_R410, CHIP_RV410|RADEON_NEW_MEMMAP, "ATI FireGL V5000 RV410"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700XT_R410, CHIP_RV410|RADEON_NEW_MEMMAP, "ATI Radeon RV410 X700 XT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700PRO_R410, CHIP_RV410|RADEON_NEW_MEMMAP, "ATI Radeon RV410 X700 Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700SE_R410, CHIP_RV410|RADEON_NEW_MEMMAP, "ATI Radeon RV410 X700 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700_PCIE, CHIP_RV410|RADEON_NEW_MEMMAP, "ATI Radeon RV410 X700"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700SE_PCIE, CHIP_RV410|RADEON_NEW_MEMMAP, "ATI Radeon RV410 X700 SE"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800A, CHIP_R520|RADEON_NEW_MEMMAP, "ATI Radeon X1800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800XT, CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1800 XT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1800, CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M_V7200, CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility FireGL V7200"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M_V7200, CHIP_R520|RADEON_NEW_MEMMAP, "ATI FireGL V7200"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5300, CHIP_R520|RADEON_NEW_MEMMAP, "ATI FireGL V5300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M_V7100, CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility FireGL V7100"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800B, CHIP_R520|RADEON_NEW_MEMMAP, "ATI Radeon X1800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800C, CHIP_R520|RADEON_NEW_MEMMAP, "ATI Radeon X1800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800D, CHIP_R520|RADEON_NEW_MEMMAP, "ATI Radeon X1800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800E, CHIP_R520|RADEON_NEW_MEMMAP, "ATI Radeon X1800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800F, CHIP_R520|RADEON_NEW_MEMMAP, "ATI Radeon X1800"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7300, CHIP_R520|RADEON_NEW_MEMMAP, "ATI FireGL V7300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7350, CHIP_R520|RADEON_NEW_MEMMAP, "ATI FireGL V7350"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1600"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV505_1, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI RV505"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_X1550, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1300/X1550"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1550"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_M54_GL, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI M54-GL"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1400, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1400"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_X1300, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1300/X1550"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_64, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1550 64-bit"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_M52, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1300_4A, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1300_4B, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1300_4C, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_4D, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_4E, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV505_2, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI RV505"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV505_3, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI RV505"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3300, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI FireGL V3300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3350, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI FireGL V3350"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_5E, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_64_2, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1550 64-bit"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300X1550, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1300/X1550"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_81, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1600"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300PRO, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1300/X1550"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1450, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1450"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1300/X1550"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X2300, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X2300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X2300_2, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X2300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1350, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1350"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1350_2, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1350"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1450, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1450"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_8F, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_2, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1550"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1350_3, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1350"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2250, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI FireMV 2250"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_64_3, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI Radeon X1550 64-bit"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_C0, CHIP_RV530|RADEON_NEW_MEMMAP, "ATI Radeon X1600"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1650, CHIP_RV530|RADEON_NEW_MEMMAP, "ATI Radeon X1650"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_PRO, CHIP_RV530|RADEON_NEW_MEMMAP, "ATI Radeon X1600"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_C3, CHIP_RV530|RADEON_NEW_MEMMAP, "ATI Radeon X1600"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5200, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility FireGL V5200"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_M, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1600"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1650_PRO, CHIP_RV530|RADEON_NEW_MEMMAP, "ATI Radeon X1650"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1650_PRO2, CHIP_RV530|RADEON_NEW_MEMMAP, "ATI Radeon X1650"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_CD, CHIP_RV530|RADEON_NEW_MEMMAP, "ATI Radeon X1600"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_XT, CHIP_RV530|RADEON_NEW_MEMMAP, "ATI Radeon X1300 XT/X1600 Pro"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3400, CHIP_RV530|RADEON_NEW_MEMMAP, "ATI FireGL V3400"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV530_M56, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility FireGL V5250"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1700, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1700"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1700XT, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1700 XT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5200_1, CHIP_RV530|RADEON_NEW_MEMMAP, "ATI FireGL V5200"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1700, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1700"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X2300HD, CHIP_RV515|RADEON_NEW_MEMMAP, "ATI  Radeon X2300HD"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X2300HD, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon HD 2300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X2300HD_1, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon HD 2300"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950_40, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1950"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_43, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950_44, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1950"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_45, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_46, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_47, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_48, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_49, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4A, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4B, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4C, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4D, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_STREAM_PROCESSOR, CHIP_R580|RADEON_NEW_MEMMAP, "ATI AMD Stream Processor"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4F, CHIP_R580|RADEON_NEW_MEMMAP, "ATI Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950_PRO, CHIP_RV570|RADEON_NEW_MEMMAP, "ATI Radeon X1950"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560, CHIP_RV560|RADEON_NEW_MEMMAP, "ATI RV560"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_1, CHIP_RV560|RADEON_NEW_MEMMAP, "ATI RV560"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1900, CHIP_R580|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Mobility Radeon X1900"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_2, CHIP_RV560|RADEON_NEW_MEMMAP, "ATI RV560"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950GT, CHIP_RV570|RADEON_NEW_MEMMAP, "ATI Radeon X1950 GT"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV570, CHIP_RV570|RADEON_NEW_MEMMAP, "ATI RV570"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV570_2, CHIP_RV570|RADEON_NEW_MEMMAP, "ATI RV570"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7400, CHIP_RV570|RADEON_NEW_MEMMAP, "ATI ATI FireGL V7400"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_3, CHIP_RV560|RADEON_NEW_MEMMAP, "ATI RV560"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RX1650_XT, CHIP_RV560|RADEON_NEW_MEMMAP, "ATI Radeon X1650"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1650_1, CHIP_RV560|RADEON_NEW_MEMMAP, "ATI Radeon X1650"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_4, CHIP_RV560|RADEON_NEW_MEMMAP, "ATI RV560"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9000IGP, CHIP_RS300|RADEON_IS_IGP|RADEON_NEW_MEMMAP, "ATI Radeon RS350 9000/9100 IGP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS350IGP, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI Radeon RS350 Mobility IGP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1250, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART, "ATI Radeon RS690 X1250 IGP"},
-	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1250IGP, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART, "ATI Radeon RS690 X1270 IGP"},
-        {0, 0, 0, NULL}
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M241P,
+	    CHIP_RV380|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X300M24,
+	    CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M24GL,
+	    CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_RV380,
+	    CHIP_RV380|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3200,
+	    CHIP_RV380|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP320,
+	    CHIP_RS100|RADEON_IS_IGP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP340,
+	    CHIP_RS200|RADEON_IS_IGP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9500PRO, CHIP_R300},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AE9700PRO, CHIP_R300},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AF9600TX, CHIP_R300},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_AGZ1, CHIP_R300},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AH_9800SE, CHIP_R350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AI_9800, CHIP_R350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AJ_9800, CHIP_R350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_AKX2, CHIP_R350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600PRO, CHIP_RV350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600LE, CHIP_RV350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600XT, CHIP_RV350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9550, CHIP_RV350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_ATT2, CHIP_RV350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9650, CHIP_RV350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_AVT2, CHIP_RV350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP_RS250,
+	    CHIP_RS200|RADEON_IS_IGP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_BB, CHIP_R200},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_BC, CHIP_R200},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP320M,
+	    CHIP_RS100|RADEON_IS_IGP|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_M6,
+	    CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_MIGP_RS250,
+	    CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV250, CHIP_RV250},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IG9000, CHIP_RV250},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_JHX800,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800PRO,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800SE,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_X3256,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_M18,
+	    CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_JOX800SE,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XTPE,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AIW_X800VE,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XT,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850SE,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850PRO,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XTPE,
+	    CHIP_R420|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M7LW,
+	    CHIP_RV200|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M7,
+	    CHIP_RV200|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M6LY,
+	    CHIP_RV100|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M6LZ,
+	    CHIP_RV100|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9LD,
+	    CHIP_RV250|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9Lf,
+	    CHIP_RV250},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9Lg,
+	    CHIP_RV250|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R300, CHIP_R300},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON9500_PRO, CHIP_R300},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON9600TX, CHIP_R300},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_X1, CHIP_R300},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R350, CHIP_R350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON9800, CHIP_R350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9800XT, CHIP_R350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_X2, CHIP_R350},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350,
+	    CHIP_RV350|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350NQ,
+	    CHIP_RV350|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350NR,
+	    CHIP_RV350|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350NS,
+	    CHIP_RV350|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV350_WS,
+	    CHIP_RV350|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_9550,
+	    CHIP_RV350|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_AIW,
+	    CHIP_R100|RADEON_SINGLE_CRTC},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QE,
+	    CHIP_R100|RADEON_SINGLE_CRTC},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QF,
+	    CHIP_R100|RADEON_SINGLE_CRTC},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QG,
+	    CHIP_R100|RADEON_SINGLE_CRTC},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QH, CHIP_R200},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_QL, CHIP_R200},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_R200_QM, CHIP_R200},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV200_QW, CHIP_RV200},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV200_QX, CHIP_RV200},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QY, CHIP_RV100},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_QZ, CHIP_RV100},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_ES1000_1, CHIP_RV100},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M300_M22,
+	    CHIP_RV380|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_M24C,
+	    CHIP_RV380|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M44,
+	    CHIP_RV380|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_RV423,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800PRORV423,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT_RV423,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800SE_RV423,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XTPRV430,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XL_RV430,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800SE_RV430,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_RV430,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7100_RV423,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5100_RV423,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_UR_RV423,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_UT_RV423,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5000_M26,
+	    CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5000_M26b,
+	    CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700XL_M26,
+	    CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700_M26_1,
+	    CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700_M26_2,
+	    CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X550XTX,
+	    CHIP_RV410|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP9100_IGP,
+	    CHIP_RS300|RADEON_IS_IGP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP9100,
+	    CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS480,
+	    CHIP_RS480|RADEON_IS_IGP|RADEON_IS_IGPGART},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS480_B,
+	    CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS482,
+	    CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS482_B,
+	    CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_PRO, CHIP_RV280},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280, CHIP_RV280},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_B, CHIP_RV280},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_SE_S, CHIP_RV280},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2200, CHIP_RV280},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_ES1000, CHIP_RV100},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS400,
+	    CHIP_RS400|RADEON_IS_IGP|RADEON_IS_IGPGART},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS400_B,
+	    CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RC410,
+	    CHIP_RS400|RADEON_IS_IGP|RADEON_IS_IGPGART},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RC410_B,
+	    CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X300,
+	    CHIP_RV380|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_RV370,
+	    CHIP_RV380|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X550,
+	    CHIP_RV380|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_RV370,
+	    CHIP_RV380|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2200_5B65,
+	    CHIP_RV380|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_M,
+	    CHIP_RV280|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M9PLUS,
+	    CHIP_RV280|RADEON_IS_MOBILITY},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT_M28,
+	    CHIP_R423|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5100_M28,
+	    CHIP_R423|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X800_M28,
+	    CHIP_R423|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850_R480,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XTPER480,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850SE_R480,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800_GTO,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_R480,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X850XT_R480,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X800XT_R423,
+	    CHIP_R423|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5000_R410,
+	    CHIP_RV410|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700XT_R410,
+	    CHIP_RV410|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700PRO_R410,
+	    CHIP_RV410|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700SE_R410,
+	    CHIP_RV410|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700_PCIE,
+	    CHIP_RV410|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X700SE_PCIE,
+	    CHIP_RV410|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800A,
+	    CHIP_R520|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800XT,
+	    CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1800,
+	    CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M_V7200,
+	    CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M_V7200,
+	    CHIP_R520|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5300,
+	    CHIP_R520|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_M_V7100,
+	    CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800B,
+	    CHIP_R520|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800C,
+	    CHIP_R520|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800D,
+	    CHIP_R520|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800E,
+	    CHIP_R520|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1800F,
+	    CHIP_R520|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7300,
+	    CHIP_R520|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7350,
+	    CHIP_R520|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV505_1,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_X1550,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_M54_GL,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1400,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_X1300,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_64,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_M52,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1300_4A,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1300_4B,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1300_4C,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_4D,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_4E,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV505_2,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV505_3,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3300,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3350,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_5E,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_64_2,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300X1550,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_81,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300PRO,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1450,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X2300,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X2300_2,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1350,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1350_2,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1450,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_8F,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_2,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1350_3,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2250,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_64_3,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_C0,
+	    CHIP_RV530|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1650,
+	    CHIP_RV530|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_PRO,
+	    CHIP_RV530|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_C3,
+	    CHIP_RV530|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5200,
+	    CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_M,
+	    CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1650_PRO,
+	    CHIP_RV530|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1650_PRO2,
+	    CHIP_RV530|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1600_CD,
+	    CHIP_RV530|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_XT,
+	    CHIP_RV530|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3400,
+	    CHIP_RV530|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV530_M56,
+	    CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1700,
+	    CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1700XT,
+	    CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5200_1,
+	    CHIP_RV530|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1700,
+	    CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X2300HD,
+	    CHIP_RV515|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X2300HD,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X2300HD_1,
+	    CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950_40,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_43,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950_44,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_45,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_46,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_47,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_48,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_49,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4A,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4B,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4C,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4D,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_STREAM_PROCESSOR,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1900_4F,
+	    CHIP_R580|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950_PRO,
+	    CHIP_RV570|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560,
+	    CHIP_RV560|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_1,
+	    CHIP_RV560|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MOBILITY_X1900,
+	    CHIP_R580|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_2,
+	    CHIP_RV560|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1950GT,
+	    CHIP_RV570|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV570,
+	    CHIP_RV570|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV570_2,
+	    CHIP_RV570|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7400,
+	    CHIP_RV570|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_3,
+	    CHIP_RV560|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RX1650_XT,
+	    CHIP_RV560|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1650_1,
+	    CHIP_RV560|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_4,
+	    CHIP_RV560|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9000IGP,
+	    CHIP_RS300|RADEON_IS_IGP|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS350IGP,
+	    CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1250,
+	    CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1250IGP,
+	    CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART},
+        {0, 0, 0}
 };
 
 static const struct drm_driver_info radeon_driver = {
diff --git a/sys/dev/pci/drm/savage_drv.c b/sys/dev/pci/drm/savage_drv.c
index d67be41d4cc..3b2e3076459 100644
--- a/sys/dev/pci/drm/savage_drv.c
+++ b/sys/dev/pci/drm/savage_drv.c
@@ -36,30 +36,30 @@ void	savagedrm_attach(struct device *, struct device *, void *);
 int	savagedrm_ioctl(struct drm_device *, u_long, caddr_t, struct drm_file *);
 
 static drm_pci_id_list_t savage_pciidlist[] = {
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE3D, S3_SAVAGE3D, "Savage 3D"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE3D_M, S3_SAVAGE3D, "Savage 3D/MV"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE4, S3_SAVAGE4, "Savage4"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE4_2, S3_SAVAGE4, "Savage4"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE_MXMV, S3_SAVAGE_MX, "Savage/MX-MV"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE_MX, S3_SAVAGE_MX, "Savage/MX"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE_IXMV, S3_SAVAGE_MX, "Savage/IX-MV"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE_IX, S3_SAVAGE_MX, "Savage/IX"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_MX128, S3_SUPERSAVAGE, "SuperSavage MX/128"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_MX64, S3_SUPERSAVAGE, "SuperSavage MX/64"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_MX64C, S3_SUPERSAVAGE, "SuperSavage MX/64C"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX128SDR, S3_SUPERSAVAGE, "SuperSavage IX/128 SDR"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX128DDR, S3_SUPERSAVAGE, "SuperSavage IX/128 DDR"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX64SDR, S3_SUPERSAVAGE, "SuperSavage IX/64 SDR"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX64DDR, S3_SUPERSAVAGE, "SuperSavage IX/64 DDR"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IXCSDR, S3_SUPERSAVAGE, "SuperSavage IX/C SDR"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IXCDDR, S3_SUPERSAVAGE, "SuperSavage IX/C DDR"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_PROSAVAGE_PM133, S3_PROSAVAGE, "ProSavage PM133"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_PROSAVAGE_KM133, S3_PROSAVAGE, "ProSavage KM133"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_TWISTER, S3_TWISTER, "ProSavage Twister PN133"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_TWISTER_K, S3_TWISTER, "ProSavage Twister KN133"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_PROSAVAGE_DDR, S3_PROSAVAGEDDR, "ProSavage DDR"},
-	{PCI_VENDOR_S3, PCI_PRODUCT_S3_PROSAVAGE_DDR_K, S3_PROSAVAGEDDR, "ProSavage DDR-K"},
-	{0, 0, 0, NULL}
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE3D, S3_SAVAGE3D},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE3D_M, S3_SAVAGE3D},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE4, S3_SAVAGE4},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE4_2, S3_SAVAGE4},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE_MXMV, S3_SAVAGE_MX},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE_MX, S3_SAVAGE_MX},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE_IXMV, S3_SAVAGE_MX},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE_IX, S3_SAVAGE_MX},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_MX128, S3_SUPERSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_MX64, S3_SUPERSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_MX64C, S3_SUPERSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX128SDR, S3_SUPERSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX128DDR, S3_SUPERSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX64SDR, S3_SUPERSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IX64DDR, S3_SUPERSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IXCSDR, S3_SUPERSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_SUPERSAVAGE_IXCDDR, S3_SUPERSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_PROSAVAGE_PM133, S3_PROSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_PROSAVAGE_KM133, S3_PROSAVAGE},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_TWISTER, S3_TWISTER},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_TWISTER_K, S3_TWISTER},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_PROSAVAGE_DDR, S3_PROSAVAGEDDR},
+	{PCI_VENDOR_S3, PCI_PRODUCT_S3_PROSAVAGE_DDR_K, S3_PROSAVAGEDDR},
+	{0, 0, 0}
 };
 
 static const struct drm_driver_info savage_driver = {
diff --git a/sys/dev/pci/drm/sis_drv.c b/sys/dev/pci/drm/sis_drv.c
index 05c5c32414d..c430e4e0206 100644
--- a/sys/dev/pci/drm/sis_drv.c
+++ b/sys/dev/pci/drm/sis_drv.c
@@ -35,14 +35,16 @@ void	sisdrm_attach(struct device *, struct device *, void *);
 int	sisdrm_ioctl(struct drm_device *, u_long, caddr_t, struct drm_file *);
 
 static drm_pci_id_list_t sis_pciidlist[] = {
-	{PCI_VENDOR_SIS, PCI_PRODUCT_SIS_300, 0, "SiS 300/305"},
-	{PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5300, 0, "SiS 540"},
-	{PCI_VENDOR_SIS, PCI_PRODUCT_SIS_6300, 0, "SiS 630"},
-	{PCI_VENDOR_SIS, PCI_PRODUCT_SIS_6330, SIS_CHIP_315, "SiS 661"},
-	{PCI_VENDOR_SIS, PCI_PRODUCT_SIS_7300, 0, "SiS 730"},
-	{PCI_VENDOR_XGI, 0x0042, SIS_CHIP_315, "Volari Unknown"},
-	{PCI_VENDOR_XGI, PCI_PRODUCT_XGI_VOLARI_V3XT, SIS_CHIP_315, "Volari V3XT/V5/V8"},
-	{0, 0, 0, NULL}
+	{PCI_VENDOR_SIS, PCI_PRODUCT_SIS_300},
+	{PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5300},
+	{PCI_VENDOR_SIS, PCI_PRODUCT_SIS_6300},
+	{PCI_VENDOR_SIS, PCI_PRODUCT_SIS_6330},
+	{PCI_VENDOR_SIS, PCI_PRODUCT_SIS_7300},
+	{PCI_VENDOR_XGI, PCI_PRODUCT_XGI_VOLARI_V3XT},
+#if 0 /* do these actually EXIST? */
+	{PCI_VENDOR_XGI, 0x0042, SIS_CHIP_315},
+#endif
+	{0, 0, 0}
 };
 
 static const struct drm_driver_info sis_driver = {
diff --git a/sys/dev/pci/drm/tdfx_drv.c b/sys/dev/pci/drm/tdfx_drv.c
index aa3317c126d..4456a7bf99e 100644
--- a/sys/dev/pci/drm/tdfx_drv.c
+++ b/sys/dev/pci/drm/tdfx_drv.c
@@ -36,13 +36,13 @@
 #include "drmP.h"
 
 static drm_pci_id_list_t tdfx_pciidlist[] = {
-	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_BANSHEE, 0, "3dfx Voodoo Banshee"},
-	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO32000, 0, "3dfx Voodoo3 2000"},
-	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO3, 0, "3dfx Voodoo3 3000"},
-	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO4, 0, "3dfx Voodoo4 4500"},
-	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO5, 0, "3dfx Voodoo5 5500"},
-	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO44200, 0, "3dfx Voodoo4 4200"},
-        {0, 0, 0, NULL}
+	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_BANSHEE},
+	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO32000},
+	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO3},
+	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO4},
+	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO5},
+	{PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO44200},
+        {0, 0, 0}
 };
 
 static const struct drm_driver_info tdfx_driver = {