diff options
Diffstat (limited to 'src')
-rwxr-xr-x | src/pcidb/parse_pci_ids.pl | 7 | ||||
-rw-r--r-- | src/radeon_chipset_gen.h | 339 | ||||
-rw-r--r-- | src/radeon_probe.c | 4 |
3 files changed, 348 insertions, 2 deletions
diff --git a/src/pcidb/parse_pci_ids.pl b/src/pcidb/parse_pci_ids.pl index 45009508..f78e207e 100755 --- a/src/pcidb/parse_pci_ids.pl +++ b/src/pcidb/parse_pci_ids.pl @@ -16,6 +16,8 @@ my $radeonpcidevicematchfile = 'radeon_pci_device_match_gen.h'; my $radeonchipsetfile = 'radeon_chipset_gen.h'; my $radeonchipinfofile = 'radeon_chipinfo_gen.h'; +my %uniquechipsets; + my $csv = Text::CSV_XS->new(); open (CSV, "<", $file) or die $!; @@ -48,6 +50,7 @@ while (<CSV>) { print PCIDEVICEMATCH " ATI_DEVICE_MATCH( PCI_CHIP_$columns[1], 0 ),\n"; print RADEONCHIPSET " { PCI_CHIP_$columns[1], \"$columns[8]\" },\n"; + $uniquechipsets{$columns[8]} = 1; print RADEONCHIPINFO " { $columns[0], CHIP_FAMILY_$columns[2], "; @@ -91,6 +94,10 @@ while (<CSV>) { } print RADEONCHIPINFO "};\n"; +print RADEONCHIPSET " { -1, NULL }\n};\n\nSymTabRec RADEONUniqueChipsets[] = {\n"; +foreach (sort keys %uniquechipsets) { + print RADEONCHIPSET " { 0, \"$_\" },\n"; +} print RADEONCHIPSET " { -1, NULL }\n};\n"; print PCICHIPSET " { -1, -1, RES_UNDEFINED }\n};\n"; print PCIDEVICEMATCH " { 0, 0, 0 }\n};\n"; diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h index 5d6d2334..ee810cbc 100644 --- a/src/radeon_chipset_gen.h +++ b/src/radeon_chipset_gen.h @@ -702,3 +702,342 @@ SymTabRec RADEONChipsets[] = { { PCI_CHIP_HAWAII_67BE, "HAWAII" }, { -1, NULL } }; + +SymTabRec RADEONUniqueChipsets[] = { + { 0, "AMD FireStream 9250" }, + { 0, "AMD FireStream 9270" }, + { 0, "AMD Firestream 9170" }, + { 0, "AMD Firestream 9350" }, + { 0, "AMD Firestream 9370" }, + { 0, "AMD Radeon HD 6200 Series Graphics" }, + { 0, "AMD Radeon HD 6250 Graphics" }, + { 0, "AMD Radeon HD 6300 Series Graphics" }, + { 0, "AMD Radeon HD 6310 Graphics" }, + { 0, "AMD Radeon HD 6700 Series" }, + { 0, "AMD Radeon HD 6800 Series" }, + { 0, "AMD Radeon HD 6900 Series" }, + { 0, "AMD Radeon HD 6900M Series" }, + { 0, "ARUBA" }, + { 0, "ATI AMD Stream Processor" }, + { 0, "ATI ES1000 515E (PCI)" }, + { 0, "ATI ES1000 5969 (PCI)" }, + { 0, "ATI FireGL 8700/8800 QH (AGP)" }, + { 0, "ATI FireGL M22 GL 5464 (PCIE)" }, + { 0, "ATI FireGL M24 GL 3154 (PCIE)" }, + { 0, "ATI FireGL Mobility 9000 (M9) Ld (AGP)" }, + { 0, "ATI FireGL Mobility T2 (M10) NT (AGP)" }, + { 0, "ATI FireGL Mobility T2e (M11) NV (AGP)" }, + { 0, "ATI FireGL RV360 AV (AGP)" }, + { 0, "ATI FireGL T2 AT (AGP)" }, + { 0, "ATI FireGL V3100 (RV370) 5B64 (PCIE)" }, + { 0, "ATI FireGL V3200 (RV380) 3E54 (PCIE)" }, + { 0, "ATI FireGL V3300" }, + { 0, "ATI FireGL V3350" }, + { 0, "ATI FireGL V3400" }, + { 0, "ATI FireGL V3600" }, + { 0, "ATI FireGL V4000" }, + { 0, "ATI FireGL V5000 (RV410) (PCIE)" }, + { 0, "ATI FireGL V5100 (R423) UQ (PCIE)" }, + { 0, "ATI FireGL V5200" }, + { 0, "ATI FireGL V5300" }, + { 0, "ATI FireGL V5600" }, + { 0, "ATI FireGL V7100 (R423) (PCIE)" }, + { 0, "ATI FireGL V7200" }, + { 0, "ATI FireGL V7300" }, + { 0, "ATI FireGL V7350" }, + { 0, "ATI FireGL V7400" }, + { 0, "ATI FireGL V7600" }, + { 0, "ATI FireGL V7700" }, + { 0, "ATI FireGL V8600" }, + { 0, "ATI FireGL V8650" }, + { 0, "ATI FireGL X1 NG (AGP)" }, + { 0, "ATI FireGL X2 AK (AGP)" }, + { 0, "ATI FireGL X2 NK (AGP)" }, + { 0, "ATI FireGL X3 (R420) JM (AGP)" }, + { 0, "ATI FireGL Z1 AG (AGP)" }, + { 0, "ATI FireGL unknown (R423) UR (PCIE)" }, + { 0, "ATI FireGL unknown (R423) UT (PCIE)" }, + { 0, "ATI FireMV 2200 (PCI)" }, + { 0, "ATI FireMV 2200 PCIE (RV370) 5B65 (PCIE)" }, + { 0, "ATI FireMV 2250" }, + { 0, "ATI FireMV 2260" }, + { 0, "ATI FireMV 2400 (PCI)" }, + { 0, "ATI FireMV 2400 3155 (PCI)" }, + { 0, "ATI FireMV 2400 PCI" }, + { 0, "ATI FireMV 2450" }, + { 0, "ATI FirePro (FireGL) Graphics Adapter" }, + { 0, "ATI FirePro 2270" }, + { 0, "ATI FirePro M5750" }, + { 0, "ATI FirePro M7740" }, + { 0, "ATI FirePro M7750" }, + { 0, "ATI FirePro RG220" }, + { 0, "ATI FirePro RV770" }, + { 0, "ATI FirePro V3700" }, + { 0, "ATI FirePro V3750 (FireGL)" }, + { 0, "ATI FirePro V5700 (FireGL)" }, + { 0, "ATI FirePro V7750 (FireGL)" }, + { 0, "ATI FirePro V7760 (FireGL)" }, + { 0, "ATI FirePro V8700 (FireGL)" }, + { 0, "ATI FirePro V8750 (FireGL)" }, + { 0, "ATI Gemini Mobility Radeon HD 2600 XT" }, + { 0, "ATI Gemini RV630" }, + { 0, "ATI M54-GL" }, + { 0, "ATI M98" }, + { 0, "ATI Mobility FireGL 7800 M7 LX (AGP)" }, + { 0, "ATI Mobility FireGL Graphics Processor" }, + { 0, "ATI Mobility FireGL V5000 (M26) (PCIE)" }, + { 0, "ATI Mobility FireGL V5100 (M28) (PCIE)" }, + { 0, "ATI Mobility FireGL V5200" }, + { 0, "ATI Mobility FireGL V5250" }, + { 0, "ATI Mobility FireGL V5700" }, + { 0, "ATI Mobility FireGL V5725" }, + { 0, "ATI Mobility FireGL V7100" }, + { 0, "ATI Mobility FireGL V7200" }, + { 0, "ATI Mobility RADEON HD 4850" }, + { 0, "ATI Mobility RADEON HD 4850 X2" }, + { 0, "ATI Mobility RADEON HD 4870" }, + { 0, "ATI Mobility RADEON M98" }, + { 0, "ATI Mobility Radeon 4100" }, + { 0, "ATI Mobility Radeon 4300 Series" }, + { 0, "ATI Mobility Radeon 4330" }, + { 0, "ATI Mobility Radeon 4500 Series" }, + { 0, "ATI Mobility Radeon Graphics" }, + { 0, "ATI Mobility Radeon HD 2300" }, + { 0, "ATI Mobility Radeon HD 2400" }, + { 0, "ATI Mobility Radeon HD 2400 XT" }, + { 0, "ATI Mobility Radeon HD 2600" }, + { 0, "ATI Mobility Radeon HD 2600 XT" }, + { 0, "ATI Mobility Radeon HD 3400 Series" }, + { 0, "ATI Mobility Radeon HD 3430" }, + { 0, "ATI Mobility Radeon HD 3650" }, + { 0, "ATI Mobility Radeon HD 3670" }, + { 0, "ATI Mobility Radeon HD 3850" }, + { 0, "ATI Mobility Radeon HD 3850 X2" }, + { 0, "ATI Mobility Radeon HD 3870" }, + { 0, "ATI Mobility Radeon HD 3870 X2" }, + { 0, "ATI Mobility Radeon HD 4200" }, + { 0, "ATI Mobility Radeon HD 4650" }, + { 0, "ATI Mobility Radeon HD 4670" }, + { 0, "ATI Mobility Radeon HD 4830" }, + { 0, "ATI Mobility Radeon HD 4850" }, + { 0, "ATI Mobility Radeon HD 5000 Series" }, + { 0, "ATI Mobility Radeon HD 5570" }, + { 0, "ATI Mobility Radeon HD 5800 Series" }, + { 0, "ATI Mobility Radeon X1300" }, + { 0, "ATI Mobility Radeon X1350" }, + { 0, "ATI Mobility Radeon X1400" }, + { 0, "ATI Mobility Radeon X1450" }, + { 0, "ATI Mobility Radeon X1600" }, + { 0, "ATI Mobility Radeon X1700" }, + { 0, "ATI Mobility Radeon X1700 XT" }, + { 0, "ATI Mobility Radeon X1800" }, + { 0, "ATI Mobility Radeon X1800 XT" }, + { 0, "ATI Mobility Radeon X1900" }, + { 0, "ATI Mobility Radeon X2300" }, + { 0, "ATI Mobility Radeon X700 (M26) (PCIE)" }, + { 0, "ATI Mobility Radeon X700 XL (M26) (PCIE)" }, + { 0, "ATI Mobility Radeon X800 (M28) (PCIE)" }, + { 0, "ATI Mobility Radeon X800 XT (M28) (PCIE)" }, + { 0, "ATI RADEON E2400" }, + { 0, "ATI RADEON E4600" }, + { 0, "ATI RS740" }, + { 0, "ATI RS740M" }, + { 0, "ATI RV505" }, + { 0, "ATI RV560" }, + { 0, "ATI RV570" }, + { 0, "ATI RV610" }, + { 0, "ATI RV630" }, + { 0, "ATI RV670" }, + { 0, "ATI RV730 PRO [Radeon HD 4650]" }, + { 0, "ATI RV730XT [Radeon HD 4670]" }, + { 0, "ATI RV740" }, + { 0, "ATI Radeon 3000 Graphics" }, + { 0, "ATI Radeon 3100 Graphics" }, + { 0, "ATI Radeon 4100" }, + { 0, "ATI Radeon 4800 Series" }, + { 0, "ATI Radeon 7000 IGP (A4+) 4237" }, + { 0, "ATI Radeon 7500 QW (AGP/PCI)" }, + { 0, "ATI Radeon 7500 QX (AGP/PCI)" }, + { 0, "ATI Radeon 8500 AIW BB (AGP)" }, + { 0, "ATI Radeon 8500 QL (AGP)" }, + { 0, "ATI Radeon 9000 Ig (AGP/PCI)" }, + { 0, "ATI Radeon 9000/PRO If (AGP/PCI)" }, + { 0, "ATI Radeon 9100 IGP (A5) 5834" }, + { 0, "ATI Radeon 9100 PRO IGP 7834" }, + { 0, "ATI Radeon 9100 QM (AGP)" }, + { 0, "ATI Radeon 9200 5961 (AGP)" }, + { 0, "ATI Radeon 9200 5962 (AGP)" }, + { 0, "ATI Radeon 9200SE 5964 (AGP)" }, + { 0, "ATI Radeon 9250 5960 (AGP)" }, + { 0, "ATI Radeon 9500 AD (AGP)" }, + { 0, "ATI Radeon 9500 AE (AGP)" }, + { 0, "ATI Radeon 9600 AP (AGP)" }, + { 0, "ATI Radeon 9600 AS (AGP)" }, + { 0, "ATI Radeon 9600SE AQ (AGP)" }, + { 0, "ATI Radeon 9600TX AF (AGP)" }, + { 0, "ATI Radeon 9600TX NF (AGP)" }, + { 0, "ATI Radeon 9600XT AR (AGP)" }, + { 0, "ATI Radeon 9650" }, + { 0, "ATI Radeon 9700 Pro ND (AGP)" }, + { 0, "ATI Radeon 9700/9500Pro NE (AGP)" }, + { 0, "ATI Radeon 9800 AI (AGP)" }, + { 0, "ATI Radeon 9800 AJ (AGP)" }, + { 0, "ATI Radeon 9800 NI (AGP)" }, + { 0, "ATI Radeon 9800PRO NH (AGP)" }, + { 0, "ATI Radeon 9800SE AH (AGP)" }, + { 0, "ATI Radeon 9800XT NJ (AGP)" }, + { 0, "ATI Radeon HD 2350" }, + { 0, "ATI Radeon HD 2400 PRO AGP" }, + { 0, "ATI Radeon HD 2400 Pro" }, + { 0, "ATI Radeon HD 2400 XT" }, + { 0, "ATI Radeon HD 2600 LE" }, + { 0, "ATI Radeon HD 2600 Pro" }, + { 0, "ATI Radeon HD 2600 Pro AGP" }, + { 0, "ATI Radeon HD 2600 XT" }, + { 0, "ATI Radeon HD 2600 XT AGP" }, + { 0, "ATI Radeon HD 2900 GT" }, + { 0, "ATI Radeon HD 2900 Pro" }, + { 0, "ATI Radeon HD 2900 XT" }, + { 0, "ATI Radeon HD 3200 Graphics" }, + { 0, "ATI Radeon HD 3300 Graphics" }, + { 0, "ATI Radeon HD 3430" }, + { 0, "ATI Radeon HD 3450" }, + { 0, "ATI Radeon HD 3470" }, + { 0, "ATI Radeon HD 3600 PRO" }, + { 0, "ATI Radeon HD 3600 Series" }, + { 0, "ATI Radeon HD 3600 XT" }, + { 0, "ATI Radeon HD 3650 AGP" }, + { 0, "ATI Radeon HD 4200" }, + { 0, "ATI Radeon HD 4250" }, + { 0, "ATI Radeon HD 4290" }, + { 0, "ATI Radeon HD 4350" }, + { 0, "ATI Radeon HD 4550" }, + { 0, "ATI Radeon HD 4600 Series" }, + { 0, "ATI Radeon HD 4700 Series" }, + { 0, "ATI Radeon HD 4770" }, + { 0, "ATI Radeon HD 4850 x2" }, + { 0, "ATI Radeon HD 4870 x2" }, + { 0, "ATI Radeon HD 5450" }, + { 0, "ATI Radeon HD 5500 Series" }, + { 0, "ATI Radeon HD 5570" }, + { 0, "ATI Radeon HD 5670" }, + { 0, "ATI Radeon HD 5700 Series" }, + { 0, "ATI Radeon HD 5800 Series" }, + { 0, "ATI Radeon HD 5900 Series" }, + { 0, "ATI Radeon HD 6700 Series" }, + { 0, "ATI Radeon HD3690" }, + { 0, "ATI Radeon HD3850" }, + { 0, "ATI Radeon HD3870" }, + { 0, "ATI Radeon HD3870 X2" }, + { 0, "ATI Radeon IGP320 (A3) 4136" }, + { 0, "ATI Radeon IGP320M (U1) 4336" }, + { 0, "ATI Radeon IGP330/340/350 (A4) 4137" }, + { 0, "ATI Radeon IGP330M/340M/350M (U2) 4337" }, + { 0, "ATI Radeon Mobility 7000 IGP 4437" }, + { 0, "ATI Radeon Mobility 9000 (M9) Lf (AGP)" }, + { 0, "ATI Radeon Mobility 9000 (M9) Lg (AGP)" }, + { 0, "ATI Radeon Mobility 9100 IGP (U3) 5835" }, + { 0, "ATI Radeon Mobility 9200 (M9+) 5C61 (AGP)" }, + { 0, "ATI Radeon Mobility 9200 (M9+) 5C63 (AGP)" }, + { 0, "ATI Radeon Mobility 9200 IGP 7835" }, + { 0, "ATI Radeon Mobility 9600 (M10) NQ (AGP)" }, + { 0, "ATI Radeon Mobility 9600 (M10) NS (AGP)" }, + { 0, "ATI Radeon Mobility 9600 (M11) NR (AGP)" }, + { 0, "ATI Radeon Mobility 9600/9700 (M10/M11) NP (AGP)" }, + { 0, "ATI Radeon Mobility 9800 (M18) JN (AGP)" }, + { 0, "ATI Radeon Mobility M6 LY (AGP)" }, + { 0, "ATI Radeon Mobility M6 LZ (AGP)" }, + { 0, "ATI Radeon Mobility M7 LW (AGP)" }, + { 0, "ATI Radeon Mobility X300 (M22) 5460 (PCIE)" }, + { 0, "ATI Radeon Mobility X300 (M24) 3152 (PCIE)" }, + { 0, "ATI Radeon Mobility X600 (M24) 3150 (PCIE)" }, + { 0, "ATI Radeon Mobility X600 SE (M24C) 5462 (PCIE)" }, + { 0, "ATI Radeon QD (AGP)" }, + { 0, "ATI Radeon QE (AGP)" }, + { 0, "ATI Radeon QF (AGP)" }, + { 0, "ATI Radeon QG (AGP)" }, + { 0, "ATI Radeon RV710" }, + { 0, "ATI Radeon RV730 (AGP)" }, + { 0, "ATI Radeon VE/7000 QY (AGP/PCI)" }, + { 0, "ATI Radeon VE/7000 QZ (AGP/PCI)" }, + { 0, "ATI Radeon X1200" }, + { 0, "ATI Radeon X1300" }, + { 0, "ATI Radeon X1300 XT/X1600 Pro" }, + { 0, "ATI Radeon X1300/X1550" }, + { 0, "ATI Radeon X1550" }, + { 0, "ATI Radeon X1550 64-bit" }, + { 0, "ATI Radeon X1600" }, + { 0, "ATI Radeon X1650" }, + { 0, "ATI Radeon X1800" }, + { 0, "ATI Radeon X1900" }, + { 0, "ATI Radeon X1950" }, + { 0, "ATI Radeon X1950 GT" }, + { 0, "ATI Radeon X2300HD" }, + { 0, "ATI Radeon X300 (RV370) 5B60 (PCIE)" }, + { 0, "ATI Radeon X550 (RV370) 5B63 (PCIE)" }, + { 0, "ATI Radeon X550XTX 5657 (PCIE)" }, + { 0, "ATI Radeon X600 (RV370) 5B62 (PCIE)" }, + { 0, "ATI Radeon X600 (RV380) 3E50 (PCIE)" }, + { 0, "ATI Radeon X700 (RV410) (PCIE)" }, + { 0, "ATI Radeon X700 PRO (RV410) (PCIE)" }, + { 0, "ATI Radeon X700 SE (RV410) (PCIE)" }, + { 0, "ATI Radeon X700 XT (RV410) (PCIE)" }, + { 0, "ATI Radeon X800 (R420) JH (AGP)" }, + { 0, "ATI Radeon X800 (R420) JK (AGP)" }, + { 0, "ATI Radeon X800 (R420) JL (AGP)" }, + { 0, "ATI Radeon X800 (R423) UH (PCIE)" }, + { 0, "ATI Radeon X800 (R430) (PCIE)" }, + { 0, "ATI Radeon X800 SE (R420) (AGP)" }, + { 0, "ATI Radeon X800 SE (R430) (PCIE)" }, + { 0, "ATI Radeon X800 VE (R420) JT (AGP)" }, + { 0, "ATI Radeon X800 XL (R430) (PCIE)" }, + { 0, "ATI Radeon X800 XTP (R430) (PCIE)" }, + { 0, "ATI Radeon X800LE (R423) UJ (PCIE)" }, + { 0, "ATI Radeon X800PRO (R420) JI (AGP)" }, + { 0, "ATI Radeon X800PRO (R423) UI (PCIE)" }, + { 0, "ATI Radeon X800SE (R420) JJ (AGP)" }, + { 0, "ATI Radeon X800SE (R423) UK (PCIE)" }, + { 0, "ATI Radeon X800XT (R420) JP (AGP)" }, + { 0, "ATI Radeon X800XT (R423) 5D57 (PCIE)" }, + { 0, "ATI Radeon X850 (R480) (AGP)" }, + { 0, "ATI Radeon X850 5D4C (PCIE)" }, + { 0, "ATI Radeon X850 PRO (R480) (AGP)" }, + { 0, "ATI Radeon X850 PRO (R480) (PCIE)" }, + { 0, "ATI Radeon X850 SE (R480) (AGP)" }, + { 0, "ATI Radeon X850 SE (R480) (PCIE)" }, + { 0, "ATI Radeon X850 XT (R480) (AGP)" }, + { 0, "ATI Radeon X850 XT (R480) (PCIE)" }, + { 0, "ATI Radeon X850 XT PE (R480) (AGP)" }, + { 0, "ATI Radeon X850 XT PE (R480) (PCIE)" }, + { 0, "ATI Radeon XPRESS 200 5954 (PCIE)" }, + { 0, "ATI Radeon XPRESS 200 5974 (PCIE)" }, + { 0, "ATI Radeon XPRESS 200 5A41 (PCIE)" }, + { 0, "ATI Radeon XPRESS 200 5A61 (PCIE)" }, + { 0, "ATI Radeon XPRESS 200M 5955 (PCIE)" }, + { 0, "ATI Radeon XPRESS 200M 5975 (PCIE)" }, + { 0, "ATI Radeon XPRESS 200M 5A42 (PCIE)" }, + { 0, "ATI Radeon XPRESS 200M 5A62 (PCIE)" }, + { 0, "ATI unknown Radeon / FireGL (R480) 5D50 (PCIE)" }, + { 0, "BARTS" }, + { 0, "BONAIRE" }, + { 0, "CAICOS" }, + { 0, "CAYMAN" }, + { 0, "CEDAR" }, + { 0, "CYPRESS" }, + { 0, "HAINAN" }, + { 0, "HAWAII" }, + { 0, "KABINI" }, + { 0, "KAVERI" }, + { 0, "MULLINS" }, + { 0, "Mobility Radeon HD 6000 Series" }, + { 0, "OLAND" }, + { 0, "PALM" }, + { 0, "PITCAIRN" }, + { 0, "REDWOOD" }, + { 0, "SUMO" }, + { 0, "SUMO2" }, + { 0, "TAHITI" }, + { 0, "TURKS" }, + { 0, "VERDE" }, + { -1, NULL } +}; diff --git a/src/radeon_probe.c b/src/radeon_probe.c index 6d6d8c54..aaace2b5 100644 --- a/src/radeon_probe.c +++ b/src/radeon_probe.c @@ -78,8 +78,8 @@ static void RADEONIdentify(int flags) { xf86PrintChipsets(RADEON_NAME, - "Driver for ATI Radeon chipsets", - RADEONChipsets); + "Driver for ATI/AMD Radeon chipsets", + RADEONUniqueChipsets); } |