Add chip family names to the radeon driver

2 files changed, 74 insertions, 58 deletions

diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index 0b97b223..41df7481 100644
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -1,62 +1,62 @@
 [radeon]
-0x1002 0x4136 CHIP_IS_IGP "ATI Radeon RS100 IGP 320M"
-0x1002 0x4137 CHIP_IS_IGP "ATI Radeon RS200 IGP"
-0x1002 0x4237 CHIP_IS_IGP "ATI Radeon RS250 IGP"
-0x1002 0x4242 0 "ATI Radeon BB R200 AIW 8500DV"
-0x1002 0x4242 0 "ATI Radeon BC R200"
-0x1002 0x4336 CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS100 Mobility U1"
-0x1002 0x4337 CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS200 Mobility IGP 340M"
-0x1002 0x4437 CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS250 Mobility IGP"
-0x1002 0x4964 0 "ATI Radeon Id R250 9000"
-0x1002 0x4965 0 "ATI Radeon Ie R250 9000"
-0x1002 0x4966 0 "ATI Radeon If R250 9000"
-0x1002 0x4967 0 "ATI Radeon Ig R250 9000"
-0x1002 0x4C57 CHIP_IS_MOBILITY "ATI Radeon LW Mobility 7500 M7"
-0x1002 0x4C58 CHIP_IS_MOBILITY "ATI Radeon LX RV200 Mobility FireGL 7800 M7"
-0x1002 0x4C59 CHIP_IS_MOBILITY "ATI Radeon LY Mobility M6"
-0x1002 0x4C5A CHIP_IS_MOBILITY "ATI Radeon LZ Mobility M6"
-0x1002 0x4C64 CHIP_IS_MOBILITY "ATI Radeon Ld R250 Mobility 9000 M9"
-0x1002 0x4C65 CHIP_IS_MOBILITY "ATI Radeon Le R250 Mobility 9000 M9"
-0x1002 0x4C66 CHIP_IS_MOBILITY "ATI Radeon Lf R250 Mobility 9000 M9"
-0x1002 0x4C67 CHIP_IS_MOBILITY "ATI Radeon Lg R250 Mobility 9000 M9"
-0x1002 0x5144 CHIP_SINGLE_CRTC "ATI Radeon QD R100"
-0x1002 0x5145 CHIP_SINGLE_CRTC "ATI Radeon QE R100"
-0x1002 0x5146 CHIP_SINGLE_CRTC "ATI Radeon QF R100"
-0x1002 0x5147 CHIP_SINGLE_CRTC "ATI Radeon QG R100"
-0x1002 0x5148 0 "ATI Radeon QH R200 8500"
-0x1002 0x5149 0 "ATI Radeon QI R200"
-0x1002 0x514A 0 "ATI Radeon QJ R200"
-0x1002 0x514B 0 "ATI Radeon QK R200"
-0x1002 0x514C 0 "ATI Radeon QL R200 8500 LE"
-0x1002 0x514D 0 "ATI Radeon QM R200 9100"
-0x1002 0x514E 0 "ATI Radeon QN R200 8500 LE"
-0x1002 0x514F 0 "ATI Radeon QO R200 8500 LE"
-0x1002 0x5157 0 "ATI Radeon QW RV200 7500"
-0x1002 0x5158 0 "ATI Radeon QX RV200 7500"
-0x1002 0x5159 0 "ATI Radeon QY RV100 7000/VE"
-0x1002 0x515A 0 "ATI Radeon QZ RV100 7000/VE"
-0x1002 0x5168 0 "ATI Radeon Qh R200"
-0x1002 0x5169 0 "ATI Radeon Qi R200"
-0x1002 0x516A 0 "ATI Radeon Qj R200"
-0x1002 0x516B 0 "ATI Radeon Qk R200"
-0x1002 0x516C 0 "ATI Radeon Ql R200"
-0x1002 0x5834 CHIP_IS_IGP "ATI Radeon RS300 IGP"
-0x1002 0x5835 CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS300 Mobility IGP"
-0x1002 0x5836 CHIP_IS_IGP "ATI Radeon RS300 IGP"
-0x1002 0x5837 CHIP_IS_IGP "ATI Radeon RS300 IGP"
-0x1002 0x5960 0 "ATI Radeon RV280 9200"
-0x1002 0x5961 0 "ATI Radeon RV280 9200 SE"
-0x1002 0x5962 0 "ATI Radeon RV280 9200"
-0x1002 0x5963 0 "ATI Radeon RV280 9200"
-0x1002 0x5964 0 "ATI Radeon RV280 9200 SE"
-0x1002 0x5968 0 "ATI Radeon RV280 9200"
-0x1002 0x5969 0 "ATI Radeon RV280 9200"
-0x1002 0x596A 0 "ATI Radeon RV280 9200"
-0x1002 0x596B 0 "ATI Radeon RV280 9200"
-0x1002 0x5c61 CHIP_IS_MOBILITY "ATI Radeon RV280 Mobility"
-0x1002 0x5c62 0 "ATI Radeon RV280"
-0x1002 0x5c63 CHIP_IS_MOBILITY "ATI Radeon RV280 Mobility"
-0x1002 0x5c64 0 "ATI Radeon RV280"
+0x1002 0x4136 CHIP_RS100|CHIP_IS_IGP "ATI Radeon RS100 IGP 320M"
+0x1002 0x4137 CHIP_RS200|CHIP_IS_IGP "ATI Radeon RS200 IGP"
+0x1002 0x4237 CHIP_RS250|CHIP_IS_IGP "ATI Radeon RS250 IGP"
+0x1002 0x4242 CHIP_R200 "ATI Radeon BB R200 AIW 8500DV"
+0x1002 0x4242 CHIP_R200 "ATI Radeon BC R200"
+0x1002 0x4336 CHIP_RS100|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS100 Mobility U1"
+0x1002 0x4337 CHIP_RS200|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS200 Mobility IGP 340M"
+0x1002 0x4437 CHIP_RS250|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS250 Mobility IGP"
+0x1002 0x4964 CHIP_R250 "ATI Radeon Id R250 9000"
+0x1002 0x4965 CHIP_R250 "ATI Radeon Ie R250 9000"
+0x1002 0x4966 CHIP_R250 "ATI Radeon If R250 9000"
+0x1002 0x4967 CHIP_R250 "ATI Radeon Ig R250 9000"
+0x1002 0x4C57 CHIP_RV200|CHIP_IS_MOBILITY "ATI Radeon LW RV200 Mobility 7500 M7"
+0x1002 0x4C58 CHIP_RV200|CHIP_IS_MOBILITY "ATI Radeon LX RV200 Mobility FireGL 7800 M7"
+0x1002 0x4C59 CHIP_RV100|CHIP_IS_MOBILITY "ATI Radeon LY RV100 Mobility M6"
+0x1002 0x4C5A CHIP_RV100|CHIP_IS_MOBILITY "ATI Radeon LZ RV100 Mobility M6"
+0x1002 0x4C64 CHIP_R250|CHIP_IS_MOBILITY "ATI Radeon Ld R250 Mobility 9000 M9"
+0x1002 0x4C65 CHIP_R250|CHIP_IS_MOBILITY "ATI Radeon Le R250 Mobility 9000 M9"
+0x1002 0x4C66 CHIP_R250|CHIP_IS_MOBILITY "ATI Radeon Lf R250 Mobility 9000 M9"
+0x1002 0x4C67 CHIP_R250|CHIP_IS_MOBILITY "ATI Radeon Lg R250 Mobility 9000 M9"
+0x1002 0x5144 CHIP_R100|CHIP_SINGLE_CRTC "ATI Radeon QD R100"
+0x1002 0x5145 CHIP_R100|CHIP_SINGLE_CRTC "ATI Radeon QE R100"
+0x1002 0x5146 CHIP_R100|CHIP_SINGLE_CRTC "ATI Radeon QF R100"
+0x1002 0x5147 CHIP_R100|CHIP_SINGLE_CRTC "ATI Radeon QG R100"
+0x1002 0x5148 CHIP_R200 "ATI Radeon QH R200 8500"
+0x1002 0x5149 CHIP_R200 "ATI Radeon QI R200"
+0x1002 0x514A CHIP_R200 "ATI Radeon QJ R200"
+0x1002 0x514B CHIP_R200 "ATI Radeon QK R200"
+0x1002 0x514C CHIP_R200 "ATI Radeon QL R200 8500 LE"
+0x1002 0x514D CHIP_R200 "ATI Radeon QM R200 9100"
+0x1002 0x514E CHIP_R200 "ATI Radeon QN R200 8500 LE"
+0x1002 0x514F CHIP_R200 "ATI Radeon QO R200 8500 LE"
+0x1002 0x5157 CHIP_RV200 "ATI Radeon QW RV200 7500"
+0x1002 0x5158 CHIP_RV200 "ATI Radeon QX RV200 7500"
+0x1002 0x5159 CHIP_RV100 "ATI Radeon QY RV100 7000/VE"
+0x1002 0x515A CHIP_RV100 "ATI Radeon QZ RV100 7000/VE"
+0x1002 0x5168 CHIP_R200 "ATI Radeon Qh R200"
+0x1002 0x5169 CHIP_R200 "ATI Radeon Qi R200"
+0x1002 0x516A CHIP_R200 "ATI Radeon Qj R200"
+0x1002 0x516B CHIP_R200 "ATI Radeon Qk R200"
+0x1002 0x516C CHIP_R200 "ATI Radeon Ql R200"
+0x1002 0x5834 CHIP_RS300|CHIP_IS_IGP "ATI Radeon RS300 IGP"
+0x1002 0x5835 CHIP_RS300|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS300 Mobility IGP"
+0x1002 0x5836 CHIP_RS300|CHIP_IS_IGP "ATI Radeon RS300 IGP"
+0x1002 0x5837 CHIP_RS300|CHIP_IS_IGP "ATI Radeon RS300 IGP"
+0x1002 0x5960 CHIP_RV280 "ATI Radeon RV280 9200"
+0x1002 0x5961 CHIP_RV280 "ATI Radeon RV280 9200 SE"
+0x1002 0x5962 CHIP_RV280 "ATI Radeon RV280 9200"
+0x1002 0x5963 CHIP_RV280 "ATI Radeon RV280 9200"
+0x1002 0x5964 CHIP_RV280 "ATI Radeon RV280 9200 SE"
+0x1002 0x5968 CHIP_RV280 "ATI Radeon RV280 9200"
+0x1002 0x5969 CHIP_RV280 "ATI Radeon RV280 9200"
+0x1002 0x596A CHIP_RV280 "ATI Radeon RV280 9200"
+0x1002 0x596B CHIP_RV280 "ATI Radeon RV280 9200"
+0x1002 0x5c61 CHIP_RV280|CHIP_IS_MOBILITY "ATI Radeon RV280 Mobility"
+0x1002 0x5c62 CHIP_RV280 "ATI Radeon RV280"
+0x1002 0x5c63 CHIP_RV280|CHIP_IS_MOBILITY "ATI Radeon RV280 Mobility"
+0x1002 0x5c64 CHIP_RV280 "ATI Radeon RV280"
 
 [r128]
 0x1002 0x4c45 0 "ATI Rage 128 Mobility LE (PCI)"
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index 8c584864..d3c65a00 100644
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -31,6 +31,22 @@
 #ifndef __RADEON_DRV_H__
 #define __RADEON_DRV_H__
 
+enum radeon_family {
+	CHIP_R100,
+	CHIP_RS100,
+	CHIP_RV100,
+	CHIP_R200,
+	CHIP_RV200,
+	CHIP_RS200,
+	CHIP_R250,
+	CHIP_RS250,
+	CHIP_RV250,
+	CHIP_RV280,
+	CHIP_R300,
+	CHIP_RS300,
+	CHIP_LAST,
+};
+
 /*
  * Chip flags
  */