Add the remaining Radeon rv610/rv620/rv630/rv635/rv670,

rv710/rv730/rv740/rv770 and rs880 devices linux matches I could find
marketing names for.

ok brynet@

1 files changed, 143 insertions, 1 deletions

diff --git a/sys/dev/pci/drm/radeon_drv.c b/sys/dev/pci/drm/radeon_drv.c
index 53a92b45fa8..bb76634bc6e 100644
--- a/sys/dev/pci/drm/radeon_drv.c
+++ b/sys/dev/pci/drm/radeon_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radeon_drv.c,v 1.60 2012/12/30 12:12:13 jsg Exp $ */
+/* $OpenBSD: radeon_drv.c,v 1.61 2013/01/02 05:52:12 jsg Exp $ */
 /* radeon_drv.c -- ATI Radeon driver -*- linux-c -*-
  * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
  */
@@ -483,28 +483,100 @@ const static struct drm_pcidev radeondrm_pciidlist[] = {
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1250IGP,
 	    CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART},
 #endif
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V4000,
+	    CHIP_RV610|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2260,
+	    CHIP_RV610|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_E2400,
+	    CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2350,
+	    CHIP_RV610|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2400_PRO,
+	    CHIP_RV610|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2400PROAGP,
+	    CHIP_RV610|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2400_XT,
 	    CHIP_RV610|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2400_M72,
+	    CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2400_XT_M,
+	    CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2400PROPCI,
+	    CHIP_RV610|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2450,
+	    CHIP_RV620|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2260_1,
+	    CHIP_RV620|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2260_2,
+	    CHIP_RV620|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_V3700,
+	    CHIP_RV620|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3400_M82,
 	    CHIP_RV620|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3430,
+	    CHIP_RV620|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3430_M,
+	    CHIP_RV620|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3450,
 	    CHIP_RV620|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3450_AGP,
+	    CHIP_RV620|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3450_PCI,
+	    CHIP_RV620|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3470,
 	    CHIP_RV620|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5600,
+	    CHIP_RV630|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V3600,
+	    CHIP_RV630|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2600_PRO,
 	    CHIP_RV630|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2600_XT,
 	    CHIP_RV630|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2600_M76,
 	    CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2600_XT_M,
+	    CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2600XTAGP,
+	    CHIP_RV630|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD2600PROAGP,
+	    CHIP_RV630|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5700_M,
+	    CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5725_M,
+	    CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3600,
+	    CHIP_RV635|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3650_AGP,
+	    CHIP_RV635|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3650_M,
 	    CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3650,
 	    CHIP_RV635|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3670_M,
 	    CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V7700,
+	    CHIP_RV670|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIRESTREAM_9170,
+	    CHIP_RV670|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3690,
+	    CHIP_RV670|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3850,
 	    CHIP_RV670|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3850_AGP,
+	    CHIP_RV670|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3850_M,
+	    CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3850_X2_M,
+	    CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3870,
+	    CHIP_RV670|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3870_X2,
+	    CHIP_RV670|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3870_M,
+	    CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3870_X2_M,
+	    CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3000,
 	    CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3200_1,
@@ -513,32 +585,102 @@ const static struct drm_pcidev radeondrm_pciidlist[] = {
 	    CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3300,
 	    CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_RG220,
+	    CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4350,
 	    CHIP_RV710|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4300_M,
+	    CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4330_M,
+	    CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4500_M,
 	    CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4500_M_2,
+	    CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4550,
 	    CHIP_RV710|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_E4600,
+	    CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_V3750,
+	    CHIP_RV730|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_V5700,
+	    CHIP_RV730|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_V7750,
+	    CHIP_RV730|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4600,
+	    CHIP_RV730|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4650,
 	    CHIP_RV730|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4650_M,
+	    CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4670,
 	    CHIP_RV730|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4670_M,
+	    CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4670_M_2,
+	    CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_M5750,
+	    CHIP_RV740|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4700,
+	    CHIP_RV740|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4770,
+	    CHIP_RV740|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4830_M,
+	    CHIP_RV740|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4850_M_2,
+	    CHIP_RV740|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_M7740,
+	    CHIP_RV740|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_M7750,
+	    CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_RV770,
+	    CHIP_RV770|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_V7760,
+	    CHIP_RV770|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_V8700,
+	    CHIP_RV770|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREPRO_V8750,
+	    CHIP_RV770|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIRESTREAM_9250,
+	    CHIP_RV770|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIRESTREAM_9270,
+	    CHIP_RV770|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4800,
+	    CHIP_RV770|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4800_2,
+	    CHIP_RV770|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4850,
 	    CHIP_RV770|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4850_M,
+	    CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4850_X2_M,
+	    CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4850_X2,
+	    CHIP_RV770|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4870,
 	    CHIP_RV770|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4870_X2,
+	    CHIP_RV770|RADEON_NEW_MEMMAP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4870_M,
+	    CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4870_M98,
 	    CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4890,
 	    CHIP_RV770|RADEON_NEW_MEMMAP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD6320,
 	    CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4100,
+	    CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4200,
 	    CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4250,
 	    CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4100_M,
+	    CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4200_M,
 	    CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
+	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4290,
+	    CHIP_RS880||RADEON_NEW_MEMMAP|RADEON_IS_IGP},
 	{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD5450,
 	    CHIP_RS880|RADEON_NEW_MEMMAP},
         {0, 0, 0}