Index: shared-core/drm_pciids.txt =================================================================== RCS file: /cvs/dri/drm/shared-core/drm_pciids.txt,v retrieving revision 1.30 diff -u -r1.30 drm_pciids.txt --- shared-core/drm_pciids.txt 2 Dec 2005 23:55:21 -0000 1.30 +++ shared-core/drm_pciids.txt 27 Dec 2005 01:05:15 -0000 @@ -1,46 +1,66 @@ [radeon] +0x1002 0x3150 CHIP_RV380|CHIP_IS_MOBILITY "ATI Radeon Mobility X600 M24" +0x1002 0x3154 CHIP_RV380|CHIP_IS_MOBILITY "ATI FireGL M24 GL" +0x1002 0x3E50 CHIP_RV380 "ATI Radeon RV380 X600" +0x1002 0x3E54 CHIP_RV380 "ATI FireGL V3200 Radeon RV380" 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 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 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 0x4153 CHIP_RV350 "ATI Radeon AS 9600" 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 0x4154 CHIP_RV350 "ATI FireGL AT T2" +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 0x4A4B CHIP_R420 "ATI Radeon JK R420 X800 XT" +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 0x4A48 CHIP_R420 "ATI Radeon JH R420 X800" +0x1002 0x4A49 CHIP_R420 "ATI Radeon JI R420 X800 Pro" +0x1002 0x4A4A CHIP_R420 "ATI Radeon JJ R420 X800 SE" +0x1002 0x4A4B CHIP_R420 "ATI Radeon JK R420 X800" +0x1002 0x4A4C CHIP_R420 "ATI Radeon JL R420 X800" +0x1002 0x4A4D CHIP_R420 "ATI FireGL JM X3" +0x1002 0x4A4E CHIP_R420|CHIP_IS_MOBILITY "ATI Radeon JN R420 Mobility M18" +0x1002 0x4A4F CHIP_R420 "ATI Radeon JO R420 X800 SE" +0x1002 0x4A50 CHIP_R420 "ATI Radeon JP R420 X800 XT" +0x1002 0x4B49 CHIP_R420 "ATI Radeon R481 X850 XT" +0x1002 0x4B4A CHIP_R420 "ATI Radeon R481 X850 SE" +0x1002 0x4B4B CHIP_R420 "ATI Radeon R481 X850 Pro" +0x1002 0x4B4C CHIP_R420 "ATI Radeon R481 X850 XT PE" 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|CHIP_IS_MOBILITY "ATI Radeon Lf RV250 Mobility 9000 M9" +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 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 0x4E4A CHIP_R350 "ATI Radeon NJ R360 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 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 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 Radeon FireGL T2 128" 0x1002 0x4E56 CHIP_RV350|CHIP_IS_MOBILITY "ATI Radeon FireGL Mobility T2e" 0x1002 0x5144 CHIP_R100|CHIP_SINGLE_CRTC "ATI Radeon QD R100" @@ -48,45 +67,71 @@ 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 0x5460 CHIP_RV380|CHIP_IS_MOBILITY "ATI Radeon Mobility X300 M22" +0x1002 0x5464 CHIP_RV380|CHIP_IS_MOBILITY "ATI FireGL M22 GL 5464" +0x1002 0x5548 CHIP_R420 "ATI Radeon R423 X800" +0x1002 0x5549 CHIP_R420 "ATI Radeon R423 X800 Pro" +0x1002 0x554A CHIP_R420 "ATI Radeon R423 X800 LE" +0x1002 0x554B CHIP_R420 "ATI Radeon R423 X800 SE" +0x1002 0x554C CHIP_R420 "ATI Radeon R430 X800 XTP" +0x1002 0x554D CHIP_R420 "ATI Radeon R430 X800 XL" +0x1002 0x554E CHIP_R420 "ATI Radeon R430 X800 SE" +0x1002 0x554F CHIP_R420 "ATI Radeon R430 X800" +0x1002 0x5550 CHIP_R420 "ATI FireGL V7100 R423" +0x1002 0x5551 CHIP_R420 "ATI FireGL V7200 R423 UQ" +0x1002 0x5552 CHIP_R420 "ATI FireGL V5100 R423 UR" +0x1002 0x5554 CHIP_R420 "ATI FireGL V7100 R423 UT" +0x1002 0x564A CHIP_RV410|CHIP_IS_MOBILITY "ATI Mobility FireGL V5000 M26" +0x1002 0x564B CHIP_RV410|CHIP_IS_MOBILITY "ATI Mobility FireGL V5000 M26" +0x1002 0x5652 CHIP_RV410|CHIP_IS_MOBILITY "ATI Radeon Mobility X700 M26" +0x1002 0x5653 CHIP_RV410|CHIP_IS_MOBILITY "ATI Radeon Mobility X700 M26" 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 0x5954 CHIP_RS400|CHIP_IS_IGP "ATI XPRESS 200 RS480 IGP" +0x1002 0x5955 CHIP_RS400|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI XPRESS 200 RS480 Mobility 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 0x5965 CHIP_RV280 "ATI FireMV 2200" 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 0x5974 CHIP_RS400|CHIP_IS_IGP "ATI XPRESS 200 RS482 IGP" +0x1002 0x5975 CHIP_RS400|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI XPRESS 200 RS482 Mobility IGP" +0x1002 0x5A41 CHIP_RS400|CHIP_IS_IGP "ATI XPRESS 200 RS400 IGP" +0x1002 0x5A42 CHIP_RS400|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI XPRESS 200 RS400 Mobility IGP" +0x1002 0x5A61 CHIP_RS400|CHIP_IS_IGP "ATI XPRESS 200 RC410 IGP" +0x1002 0x5A62 CHIP_RS400|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI XPRESS 200 RC410 Mobility IGP" +0x1002 0x5b60 CHIP_RV380 "ATI Radeon RV370 X300 SE" +0x1002 0x5b62 CHIP_RV380 "ATI Radeon RV370 X600 Pro" +0x1002 0x5b64 CHIP_RV380 "ATI FireGL V3100 (RV370) 5B64" +0x1002 0x5b65 CHIP_RV380 "ATI FireGL D1100 (RV370) 5B65" 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 0x5d48 CHIP_R420|CHIP_IS_MOBILITY "ATI Mobility Radeon X800 XT M28" +0x1002 0x5d49 CHIP_R420|CHIP_IS_MOBILITY "ATI Mobility FireGL V5100 M28" +0x1002 0x5d4a CHIP_R420|CHIP_IS_MOBILITY "ATI Mobility Radeon X800 M28" +0x1002 0x5d4c CHIP_R420 "ATI Radeon R480 X850" +0x1002 0x5d4d CHIP_R420 "ATI Radeon R480 X850 XT PE" +0x1002 0x5d4e CHIP_R420 "ATI Radeon R480 X850 SE" +0x1002 0x5d4f CHIP_R420 "ATI Radeon R480 X850 Pro" +0x1002 0x5d50 CHIP_R420 "ATI Radeon/FireGL NoIdeaWhichVersion R480" +0x1002 0x5d52 CHIP_R420 "ATI Radeon R480 X850 XT" +0x1002 0x5d57 CHIP_R420 "ATI Radeon R423 X800 XT" +0x1002 0x5e48 CHIP_RV410 "ATI FireGL V5000 RV410" +0x1002 0x5e4a CHIP_RV410 "ATI Radeon RV410 X700 XT" +0x1002 0x5e4b CHIP_RV410 "ATI Radeon RV410 X700 Pro" +0x1002 0x5e4c CHIP_RV410 "ATI Radeon RV410 X700 SE" +0x1002 0x5e4d CHIP_RV410 "ATI Radeon RV410 X700" +0x1002 0x5e4f CHIP_RV410 "ATI Radeon RV410 X700 SE" +0x1002 0x7834 CHIP_RS300|CHIP_IS_IGP "ATI Radeon RS350 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)" Index: shared-core/radeon_cp.c =================================================================== RCS file: /cvs/dri/drm/shared-core/radeon_cp.c,v retrieving revision 1.70 diff -u -r1.70 radeon_cp.c --- shared-core/radeon_cp.c 16 Dec 2005 08:02:17 -0000 1.70 +++ shared-core/radeon_cp.c 27 Dec 2005 01:05:18 -0000 @@ -2110,7 +2110,9 @@ 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: Index: shared-core/radeon_drv.h =================================================================== RCS file: /cvs/dri/drm/shared-core/radeon_drv.h,v retrieving revision 1.62 diff -u -r1.62 radeon_drv.h --- shared-core/radeon_drv.h 16 Dec 2005 08:02:17 -0000 1.62 +++ shared-core/radeon_drv.h 27 Dec 2005 01:05:22 -0000 @@ -96,20 +96,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, };