Add all radeon pci ids known by ddx, but only r350/rv350 and below (new

    chips may be problematic). Leave the existing entries for new chips in
    though. Remove ids not known by ddx (secondary ids, non-existant,...).
    Correct some entries (name/family). Make the radeon family enum look
    more alike the ddx/dri versions. See #5413

diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index 310106e..ef8cfff 100644 (file)
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -1,92 +1,81 @@
 [radeon]
-0x1002 0x4136 CHIP_RS100|CHIP_IS_IGP "ATI Radeon RS100 IGP 320M"
-0x1002 0x4137 CHIP_RS200|CHIP_IS_IGP "ATI Radeon RS200 IGP"
-0x1002 0x4144 CHIP_R300 "ATI Radeon AD 9500 Pro"
+0x1002 0x4136 CHIP_RS100|CHIP_IS_IGP "ATI Radeon RS100 IGP 320"
+0x1002 0x4137 CHIP_RS200|CHIP_IS_IGP "ATI Radeon RS200 IGP 340"
+0x1002 0x4144 CHIP_R300 "ATI Radeon AD 9500"
 0x1002 0x4145 CHIP_R300 "ATI Radeon AE 9700 Pro"
-0x1002 0x4146 CHIP_R300 "ATI Radeon AF 9700 Pro"
-0x1002 0x4147 CHIP_R300 "ATI FireGL AG Z1/X1"
+0x1002 0x4146 CHIP_R300 "ATI Radeon AF R300 9600TX"
+0x1002 0x4147 CHIP_R300 "ATI FireGL AG Z1"
+0x1002 0x4148 CHIP_R350 "ATI Radeon AH 9800 SE"
+0x1002 0x4149 CHIP_R350 "ATI Radeon AI 9800"
+0x1002 0x414A CHIP_R350 "ATI Radeon AJ 9800"
+0x1002 0x414B CHIP_R350 "ATI FireGL AK X2"
 0x1002 0x4150 CHIP_RV350 "ATI Radeon AP 9600"
-0x1002 0x4151 CHIP_RV350 "ATI Radeon AQ 9600"
-0x1002 0x4152 CHIP_RV350 "ATI Radeon AR 9600"
-0x1002 0x4153 CHIP_RV350 "ATI Radeon AS 9600 AS"
+0x1002 0x4151 CHIP_RV350 "ATI Radeon AQ 9600 SE"
+0x1002 0x4152 CHIP_RV350 "ATI Radeon AR 9600 XT"
+0x1002 0x4153 CHIP_RV350 "ATI Radeon AS 9550"
 0x1002 0x4154 CHIP_RV350 "ATI FireGL AT T2"
-0x1002 0x4156 CHIP_RV350 "ATI FireGL AV T2"
-0x1002 0x4237 CHIP_RS250|CHIP_IS_IGP "ATI Radeon RS250 IGP"
+0x1002 0x4155 CHIP_RV350 "ATI Radeon 9650"
+0x1002 0x4156 CHIP_RV350 "ATI FireGL AV RV360 T2"
+0x1002 0x4237 CHIP_RS200|CHIP_IS_IGP "ATI Radeon RS250 IGP"
 0x1002 0x4242 CHIP_R200 "ATI Radeon BB R200 AIW 8500DV"
 0x1002 0x4243 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 0x4A49 CHIP_R420 "ATI Radeon JI R420 X800PRO"
+0x1002 0x4437 CHIP_RS200|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS250 Mobility IGP"
+0x1002 0x4966 CHIP_RV250 "ATI Radeon If RV250 9000"
+0x1002 0x4967 CHIP_RV250 "ATI Radeon Ig RV250 9000"
+0x1002 0x4A49 CHIP_R420 "ATI Radeon JI R420 X800 Pro"
 0x1002 0x4A4B CHIP_R420 "ATI Radeon JK R420 X800 XT"
 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 0x4C64 CHIP_RV250|CHIP_IS_MOBILITY "ATI Radeon Ld RV250 Mobility 9000 M9"
+0x1002 0x4C66 CHIP_RV250 "ATI Radeon Lf RV250 Mobility 9000 M9 / FireMV 2400 PCI"
+0x1002 0x4C67 CHIP_RV250|CHIP_IS_MOBILITY "ATI Radeon Lg RV250 Mobility 9000 M9"
 0x1002 0x4E44 CHIP_R300 "ATI Radeon ND R300 9700 Pro"
-0x1002 0x4E45 CHIP_R300 "ATI Radeon NE R300 9500 Pro"
-0x1002 0x4E46 CHIP_RV350 "ATI Radeon NF RV350 9600"
+0x1002 0x4E45 CHIP_R300 "ATI Radeon NE R300 9500 Pro / 9700"
+0x1002 0x4E46 CHIP_R300 "ATI Radeon NF R300 9600TX"
 0x1002 0x4E47 CHIP_R300 "ATI Radeon NG R300 FireGL X1"
 0x1002 0x4E48 CHIP_R350 "ATI Radeon NH R350 9800 Pro"
 0x1002 0x4E49 CHIP_R350 "ATI Radeon NI R350 9800"
-0x1002 0x4E4A CHIP_RV350 "ATI Radeon NJ RV350 9800 XT"
-0x1002 0x4E4B CHIP_R350 "ATI Radeon NK R350 FireGL X2"
-0x1002 0x4E50 CHIP_RV350|CHIP_IS_MOBILITY "ATI Radeon RV300 Mobility 9600 M10"
+0x1002 0x4E4A CHIP_R350 "ATI Radeon NJ R360 9800 XT"
+0x1002 0x4E4B CHIP_R350 "ATI FireGL NK X2"
+0x1002 0x4E50 CHIP_RV350|CHIP_IS_MOBILITY "ATI Radeon RV350 Mobility 9600 M10 NP"
 0x1002 0x4E51 CHIP_RV350|CHIP_IS_MOBILITY "ATI Radeon RV350 Mobility 9600 M10 NQ"
-0x1002 0x4E54 CHIP_RV350|CHIP_IS_MOBILITY "ATI Radeon FireGL T2 128"
-0x1002 0x4E56 CHIP_RV350|CHIP_IS_MOBILITY "ATI Radeon FireGL Mobility T2e"
+0x1002 0x4E52 CHIP_RV350|CHIP_IS_MOBILITY "ATI Radeon RV350 Mobility 9600 M11 NR"
+0x1002 0x4E53 CHIP_RV350|CHIP_IS_MOBILITY "ATI Radeon RV350 Mobility 9600 M10 NS"
+0x1002 0x4E54 CHIP_RV350|CHIP_IS_MOBILITY "ATI FireGL T2/T2e"
+0x1002 0x4E56 CHIP_RV350|CHIP_IS_MOBILITY "ATI Radeon Mobility 9550"
 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 0x515E CHIP_RV100 "ATI ES1000 RN50"
-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 0x5460 CHIP_RV350 "ATI Radeon X300"
-0x1002 0x554F CHIP_R350 "ATI Radeon X800"
-0x1002 0x5834 CHIP_RS300|CHIP_IS_IGP "ATI Radeon RS300 IGP"
+0x1002 0x5460 CHIP_RV380|CHIP_IS_MOBILITY "ATI Radeon Mobility X300 M22"
+0x1002 0x554F CHIP_R420 "ATI Radeon R430 X800"
+0x1002 0x5834 CHIP_RS300|CHIP_IS_IGP "ATI Radeon RS300 9100 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 0x5960 CHIP_RV280 "ATI Radeon RV280 9250"
+0x1002 0x5961 CHIP_RV280 "ATI Radeon RV280 9200"
 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 0x5965 CHIP_RV280 "ATI FireMV 2200 PCI"
 0x1002 0x5969 CHIP_RV100 "ATI ES1000 RN50"
-0x1002 0x596A CHIP_RV280 "ATI Radeon RV280 9200"
-0x1002 0x596B CHIP_RV280 "ATI Radeon RV280 9200"
-0x1002 0x5b60 CHIP_RV350 "ATI Radeon RV370 X300SE"
+0x1002 0x5b60 CHIP_RV380 "ATI Radeon RV370 X300 SE"
 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"
-0x1002 0x5d4d CHIP_R350  "ATI Radeon R480"
-0x1002 0x5e4b CHIP_R420  "ATI Radeon RV410 X700PRO"
+0x1002 0x5d4d CHIP_R420 "ATI Radeon R480 X850 XT PE"
+0x1002 0x5e4b CHIP_RV410 "ATI Radeon RV410 X700 Pro"
+0x1002 0x7834 CHIP_RS300|CHIP_IS_IGP "ATI Radeon RS350 9000/9100 IGP"
+0x1002 0x7835 CHIP_RS300|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS350 Mobility IGP"
 
 [r128]
 0x1002 0x4c45 0 "ATI Rage 128 Mobility LE (PCI)"

diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index bb64c12..9ac83a0 100644 (file)
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -2179,7 +2179,9 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
        case CHIP_RV200:
        case CHIP_R200:
        case CHIP_R300:
+       case CHIP_R350:
        case CHIP_R420:
+       case CHIP_RV410:
                dev_priv->flags |= CHIP_HAS_HIERZ;
                break;
        default:

diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index b751534..51d9157 100644 (file)
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -38,7 +38,7 @@
 
 #define DRIVER_NAME            "radeon"
 #define DRIVER_DESC            "ATI Radeon"
-#define DRIVER_DATE            "20060120"
+#define DRIVER_DATE            "20060225"
 
 /* Interface history:
  *
@@ -99,20 +99,21 @@
 
 enum radeon_family {
        CHIP_R100,
-       CHIP_RS100,
        CHIP_RV100,
+       CHIP_RS100,
        CHIP_RV200,
-       CHIP_R200,
        CHIP_RS200,
-       CHIP_R250,
-       CHIP_RS250,
+       CHIP_R200,
        CHIP_RV250,
+       CHIP_RS300,
        CHIP_RV280,
        CHIP_R300,
-       CHIP_RS300,
        CHIP_R350,
        CHIP_RV350,
+       CHIP_RV380,
        CHIP_R420,
+       CHIP_RV410,
+       CHIP_RS400,
        CHIP_LAST,
 };