? Makefile ? XF98Config ? Xorg.1x.html ? Xorg._man ? radeon_new_pciids.diff ? xf86Build.h ? xorg.conf ? xorg.conf.5x.html ? xorg.conf._man ? common/Makefile ? common/modedefs ? common/xf86DefModeSet.c ? ddc/Makefile ? doc/BugReport ? doc/Makefile ? doc/man/Makefile ? doc/man/XF86VM._man ? doc/man/XF86VidMode.3x.html ? drivers/Makefile ? drivers/ati.wip ? drivers/apm/Makefile ? drivers/apm/apm.4.html ? drivers/apm/apm._man ? drivers/ark/Makefile ? drivers/ati/Makefile ? drivers/ati/benh.pll ? drivers/ati/r128.4.html ? drivers/ati/r128._man ? drivers/ati/radeon-pll-workaround.diff ? drivers/ati/radeon.4.html ? drivers/ati/radeon._man ? drivers/chips/Makefile ? drivers/chips/chips.4.html ? drivers/chips/chips._man ? drivers/cirrus/Makefile ? drivers/cirrus/cirrus.4.html ? drivers/cirrus/cirrus._man ? drivers/cyrix/Makefile ? drivers/cyrix/cyrix.4.html ? drivers/cyrix/cyrix._man ? drivers/dummy/Makefile ? drivers/fbdev/Makefile ? drivers/fbdev/fbdev.4.html ? drivers/fbdev/fbdev._man ? drivers/glint/Makefile ? drivers/glint/glint.4.html ? drivers/glint/glint._man ? drivers/i128/Makefile ? drivers/i128/i128.4.html ? drivers/i128/i128._man ? drivers/i2c/Makefile ? drivers/i740/Makefile ? drivers/i740/i740.4.html ? drivers/i740/i740._man ? drivers/i810/Makefile ? drivers/i810/i810.4.html ? drivers/i810/i810._man ? drivers/imstt/Makefile ? drivers/mga/Makefile ? drivers/mga/mga-i2c.patch ? drivers/mga/mga.4.html ? drivers/mga/mga._man ? drivers/neomagic/Makefile ? drivers/neomagic/neomagic.4.html ? drivers/neomagic/neomagic._man ? drivers/neomagic/neovideo.diff ? drivers/newport/Makefile ? drivers/nsc/Makefile ? drivers/nsc/nsc.4.html ? drivers/nsc/nsc._man ? drivers/nv/Makefile ? drivers/nv/nv.4.html ? drivers/nv/nv._man ? drivers/rendition/Makefile ? drivers/rendition/rendition.4.html ? drivers/rendition/rendition._man ? drivers/s3/Makefile ? drivers/s3virge/Makefile ? drivers/s3virge/s3virge.4.html ? drivers/s3virge/s3virge._man ? drivers/savage/Makefile ? drivers/savage/port-fixes.diff ? drivers/savage/pre-dh-commit.diff ? drivers/savage/s2kXv.diff ? drivers/savage/savage-dri-to-xorg.diff ? drivers/savage/savage.4.html ? drivers/savage/savage._man ? drivers/savage/xorg-savage-dualhead.diff ? drivers/siliconmotion/Makefile ? drivers/siliconmotion/siliconmotion.4.html ? drivers/siliconmotion/siliconmotion._man ? drivers/sis/Makefile ? drivers/sis/sis.4.html ? drivers/sis/sis._man ? drivers/sisusb/Makefile ? drivers/tdfx/Makefile ? drivers/tdfx/tdfx.4.html ? drivers/tdfx/tdfx._man ? drivers/tga/Makefile ? drivers/trident/Makefile ? drivers/trident/trident.4.html ? drivers/trident/trident._man ? drivers/tseng/Makefile ? drivers/tseng/tseng.4.html ? drivers/tseng/tseng._man ? drivers/v4l/Makefile ? drivers/v4l/v4l.4.html ? drivers/v4l/v4l._man ? drivers/vesa/Makefile ? drivers/vesa/vesa.4.html ? drivers/vesa/vesa._man ? drivers/vga/Makefile ? drivers/vga/vga.4.html ? drivers/vga/vga._man ? drivers/via/Makefile ? drivers/via/via.4.html ? drivers/via/via._man ? drivers/vmware/Makefile ? drivers/vmware/vmware.4.html ? drivers/vmware/vmware._man ? dummylib/Makefile ? etc/Makefile ? etc/gtf ? etc/gtf.1x.html ? etc/gtf._man ? etc/ioport ? etc/mmapr ? etc/mmapw ? etc/pcitweak ? etc/pcitweak.1x.html ? etc/pcitweak._man ? etc/scanpci ? etc/scanpci.1x.html ? etc/scanpci._man ? fbdevhw/Makefile ? fbdevhw/fbdevhw.4.html ? fbdevhw/fbdevhw._man ? getconfig/Makefile ? getconfig/cfg._man ? getconfig/getconfig ? getconfig/getconfig.1x.html ? getconfig/getconfig.5x.html ? getconfig/getconfig._man ? i2c/Makefile ? input/Makefile ? input/acecad/Makefile ? input/aiptek/Makefile ? input/aiptek/aiptek.4.html ? input/aiptek/aiptek._man ? input/calcomp/Makefile ? input/citron/Makefile ? input/citron/citron.4.html ? input/citron/citron._man ? input/digitaledge/Makefile ? input/dmc/Makefile ? input/dmc/dmc.4.html ? input/dmc/dmc._man ? input/dynapro/Makefile ? input/dynapro/dynapro.4.html ? input/dynapro/dynapro._man ? input/elographics/Makefile ? input/elographics/elographics.4.html ? input/elographics/elographics._man ? input/evdev/Makefile ? input/fpit/Makefile ? input/fpit/fpit.4.html ? input/fpit/fpit._man ? input/hyperpen/Makefile ? input/jamstudio/Makefile ? input/jamstudio/js_x.4.html ? input/jamstudio/js_x._man ? input/keyboard/Makefile ? input/keyboard/kbd.4.html ? input/keyboard/kbd._man ? input/keyboard/keyboard.4.html ? input/keyboard/keyboard._man ? input/magellan/Makefile ? input/microtouch/Makefile ? input/microtouch/microtouch.4.html ? input/microtouch/microtouch._man ? input/mouse/Makefile ? input/mouse/mouse.4.html ? input/mouse/mouse._man ? input/mutouch/Makefile ? input/mutouch/mutouch.4.html ? input/mutouch/mutouch._man ? input/palmax/Makefile ? input/palmax/palmax.4.html ? input/palmax/palmax._man ? input/penmount/Makefile ? input/penmount/penmount.4.html ? input/penmount/penmount._man ? input/spaceorb/Makefile ? input/summa/Makefile ? input/tek4957/Makefile ? input/tek4957/tek4957.4.html ? input/tek4957/tek4957._man ? input/ur98/Makefile ? input/ur98/ur98.4.html ? input/ur98/ur98._man ? input/void/Makefile ? input/void/void.4.html ? input/void/void._man ? input/wacom/Makefile ? input/wacom/wacom.4.html ? input/wacom/wacom._man ? int10/Makefile ? loader/Makefile ? os-support/Makefile ? os-support/bus/DONE ? os-support/bus/Makefile ? os-support/linux/DONE ? os-support/linux/Makefile ? os-support/linux/drm/Makefile ? os-support/linux/int10/Makefile ? os-support/linux/int10/vm86/DONE ? os-support/linux/int10/vm86/Makefile ? os-support/misc/DONE ? os-support/misc/Makefile ? parser/Makefile ? parser/cpconfig ? rac/Makefile ? ramdac/Makefile ? scanpci/Makefile ? scanpci/pci.ids ? scanpci/xf86PciIds.h ? scanpci/module/Makefile ? sdk/Makefile ? shadowfb/Makefile ? vbe/Makefile ? vgahw/Makefile ? xaa/Makefile ? xaa/lsb_first/DONE ? xaa/lsb_first/Makefile ? xaa/lsb_fixed/DONE ? xaa/lsb_fixed/Makefile ? xaa/msb_first/DONE ? xaa/msb_first/Makefile ? xaa/msb_fixed/DONE ? xaa/msb_fixed/Makefile ? xf1bpp/Makefile ? xf1bpp/maskbits.c ? xf1bpp/mfbbitblt.c ? xf1bpp/mfbblt.c ? xf1bpp/mfbbres.c ? xf1bpp/mfbbresd.c ? xf1bpp/mfbbstore.c ? xf1bpp/mfbclip.c ? xf1bpp/mfbcmap.c ? xf1bpp/mfbfillarc.c ? xf1bpp/mfbfillrct.c ? xf1bpp/mfbfillsp.c ? xf1bpp/mfbfont.c ? xf1bpp/mfbgc.c ? xf1bpp/mfbgetsp.c ? xf1bpp/mfbhrzvert.c ? xf1bpp/mfbimage.c ? xf1bpp/mfbimggblt.c ? xf1bpp/mfbline.c ? xf1bpp/mfbmisc.c ? xf1bpp/mfbpixmap.c ? xf1bpp/mfbply1rct.c ? xf1bpp/mfbplygblt.c ? xf1bpp/mfbpntarea.c ? xf1bpp/mfbpntwin.c ? xf1bpp/mfbpolypnt.c ? xf1bpp/mfbpushpxl.c ? xf1bpp/mfbscrclse.c ? xf1bpp/mfbscrinit.c ? xf1bpp/mfbsetsp.c ? xf1bpp/mfbtegblt.c ? xf1bpp/mfbtile.c ? xf1bpp/mfbwindow.c ? xf1bpp/mfbzerarc.c ? xf4bpp/Makefile ? xf86cfg/Makefile ? xf86cfg/XOrgCfg.ad ? xf86cfg/xorgcfg ? xf86cfg/xorgcfg.1x.html ? xf86cfg/xorgcfg._man ? xf86config/Makefile ? xf86config/xorgconfig ? xf86config/xorgconfig.1x.html ? xf86config/xorgconfig._man ? xf8_16bpp/Makefile ? xf8_32bpp/Makefile Index: common/xf86PciInfo.h =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v retrieving revision 1.5 diff -u -r1.5 xf86PciInfo.h --- common/xf86PciInfo.h 18 Mar 2005 22:36:47 -0000 1.5 +++ common/xf86PciInfo.h 29 Mar 2005 05:57:28 -0000 @@ -140,6 +140,7 @@ #define PCI_CHIP_RV360_AR 0x4152 #define PCI_CHIP_RV350_AS 0x4153 #define PCI_CHIP_RV350_AT 0x4154 +#define PCI_CHIP_RV350_4155 0x4155 #define PCI_CHIP_RV350_AV 0x4156 #define PCI_CHIP_MACH32 0x4158 #define PCI_CHIP_RS250_4237 0x4237 @@ -180,7 +181,12 @@ #define PCI_CHIP_R420_JL 0x4A4C #define PCI_CHIP_R420_JM 0x4A4D #define PCI_CHIP_R420_JN 0x4A4E +#define PCI_CHIP_R420_4A4F 0x4A4F #define PCI_CHIP_R420_JP 0x4A50 +#define PCI_CHIP_R481_4B49 0x4B49 +#define PCI_CHIP_R481_4B4A 0x4B4A +#define PCI_CHIP_R481_4B4B 0x4B4B +#define PCI_CHIP_R481_4B4C 0x4B4C #define PCI_CHIP_MACH64LB 0x4C42 #define PCI_CHIP_MACH64LD 0x4C44 #define PCI_CHIP_RAGE128LE 0x4C45 @@ -258,6 +264,7 @@ #define PCI_CHIP_RV200_QX 0x5158 #define PCI_CHIP_RV100_QY 0x5159 #define PCI_CHIP_RV100_QZ 0x515A +#define PCI_CHIP_RN50_515E 0x515E #define PCI_CHIP_RAGE128RE 0x5245 #define PCI_CHIP_RAGE128RF 0x5246 #define PCI_CHIP_RAGE128RG 0x5247 @@ -289,9 +296,18 @@ #define PCI_CHIP_R423_UI 0x5549 #define PCI_CHIP_R423_UJ 0x554A #define PCI_CHIP_R423_UK 0x554B +#define PCI_CHIP_R430_554C 0x554C +#define PCI_CHIP_R430_554D 0x554D +#define PCI_CHIP_R430_554E 0x554E +#define PCI_CHIP_R430_554F 0x554F +#define PCI_CHIP_R423_5550 0x5550 #define PCI_CHIP_R423_UQ 0x5551 #define PCI_CHIP_R423_UR 0x5552 #define PCI_CHIP_R423_UT 0x5554 +#define PCI_CHIP_RV410_564A 0x564A +#define PCI_CHIP_RV410_564B 0x564B +#define PCI_CHIP_RV410_5652 0x5652 +#define PCI_CHIP_RV410_5653 0x5653 #define PCI_CHIP_MACH64VT 0x5654 #define PCI_CHIP_MACH64VU 0x5655 #define PCI_CHIP_MACH64VV 0x5656 @@ -299,6 +315,20 @@ #define PCI_CHIP_RS300_5835 0x5835 #define PCI_CHIP_RS300_5836 0x5836 #define PCI_CHIP_RS300_5837 0x5837 +#define PCI_CHIP_RS480_5954 0x5954 +#define PCI_CHIP_RS480_5955 0x5955 +#define PCI_CHIP_RV280_5960 0x5960 +#define PCI_CHIP_RV280_5961 0x5961 +#define PCI_CHIP_RV280_5962 0x5962 +#define PCI_CHIP_RV280_5964 0x5964 +#define PCI_CHIP_RV280_5965 0x5965 +#define PCI_CHIP_RN50_5969 0x5969 +#define PCI_CHIP_RS482_5974 0x5974 +#define PCI_CHIP_RS482_5975 0x5975 +#define PCI_CHIP_RS400_5A41 0x5A41 +#define PCI_CHIP_RS400_5A42 0x5A42 +#define PCI_CHIP_RC410_5A61 0x5A61 +#define PCI_CHIP_RC410_5A62 0x5A62 #define PCI_CHIP_RV370_5B60 0x5B60 #define PCI_CHIP_RV370_5B61 0x5B61 #define PCI_CHIP_RV370_5B62 0x5B62 @@ -307,15 +337,24 @@ #define PCI_CHIP_RV370_5B65 0x5B65 #define PCI_CHIP_RV370_5B66 0x5B66 #define PCI_CHIP_RV370_5B67 0x5B67 -#define PCI_CHIP_RV280_5960 0x5960 -#define PCI_CHIP_RV280_5961 0x5961 -#define PCI_CHIP_RV280_5962 0x5962 -#define PCI_CHIP_RV280_5964 0x5964 #define PCI_CHIP_RV280_5C61 0x5C61 #define PCI_CHIP_RV280_5C63 0x5C63 -#define PCI_CHIP_RN50_515E 0x515E -#define PCI_CHIP_RN50_5969 0x5969 +#define PCI_CHIP_R430_5D48 0x5D48 +#define PCI_CHIP_R430_5D49 0x5D49 +#define PCI_CHIP_R430_5D4A 0x5D4A +#define PCI_CHIP_R480_5D4C 0x5D4C +#define PCI_CHIP_R480_5D4D 0x5D4D +#define PCI_CHIP_R480_5D4E 0x5D4E +#define PCI_CHIP_R480_5D4F 0x5D4F +#define PCI_CHIP_R480_5D50 0x5D50 +#define PCI_CHIP_R480_5D52 0x5D52 #define PCI_CHIP_R423_5D57 0x5D57 +#define PCI_CHIP_RV410_5E48 0x5E48 +#define PCI_CHIP_RV410_5E4A 0x5E4A +#define PCI_CHIP_RV410_5E4B 0x5E4B +#define PCI_CHIP_RV410_5E4C 0x5E4C +#define PCI_CHIP_RV410_5E4D 0x5E4D +#define PCI_CHIP_RV410_5E4F 0x5E4F #define PCI_CHIP_RS350_7834 0x7834 #define PCI_CHIP_RS350_7835 0x7835 Index: drivers/ati/radeon.man =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man,v retrieving revision 1.19 diff -u -r1.19 radeon.man --- drivers/ati/radeon.man 31 Jan 2005 20:10:28 -0000 1.19 +++ drivers/ati/radeon.man 29 Mar 2005 05:57:29 -0000 @@ -52,6 +52,9 @@ .B RS350 Radeon 9200 IGP .TP 12 +.B RS400 +Radeon XPRESS 200/200M IGP +.TP 12 .B RV280 Radeon 9200PRO/9200/9200SE, M9+ .TP 12 @@ -76,11 +79,17 @@ .B RV380 Radeon X600, M24 (2d only) .TP 12 +.B RV410 +Radeon X700, M26 PCIE (2d only) +.TP 12 .B R420 -Radeon X800 (2d only) +Radeon X800 AGP (2d only) +.TP 12 +.B R423/R430 +Radeon X800, M28 PCIE (2d only) .TP 12 -.B R423 -Radeon X800 PCIE (2d only) +.B R480/R481 +Radeon X850 PCIE/AGP (2d only) .SH CONFIGURATION DETAILS Please refer to __xconfigfile__(__filemansuffix__) for general configuration Index: drivers/ati/radeon_chipset.h =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h,v retrieving revision 1.3 diff -u -r1.3 radeon_chipset.h --- drivers/ati/radeon_chipset.h 18 Mar 2005 22:36:47 -0000 1.3 +++ drivers/ati/radeon_chipset.h 29 Mar 2005 05:57:29 -0000 @@ -37,6 +37,7 @@ { PCI_CHIP_RV280_5961, "ATI Radeon 9200 5961 (AGP)" }, { PCI_CHIP_RV280_5962, "ATI Radeon 9200 5962 (AGP)" }, { PCI_CHIP_RV280_5964, "ATI Radeon 9200SE 5964 (AGP)" }, + { PCI_CHIP_RV280_5965, "ATI FireMV 2200 (PCI)" }, { PCI_CHIP_RV280_5C61, "ATI Radeon Mobility 9200 (M9+) 5C61 (AGP)" }, { PCI_CHIP_RV280_5C63, "ATI Radeon Mobility 9200 (M9+) 5C63 (AGP)" }, { PCI_CHIP_R300_AD, "ATI Radeon 9500 AD (AGP)" }, @@ -59,6 +60,7 @@ { PCI_CHIP_RV350_NS, "ATI Radeon Mobility 9600 (M10) NS (AGP)" }, { PCI_CHIP_RV350_NT, "ATI FireGL Mobility T2 (M10) NT (AGP)" }, { PCI_CHIP_RV350_NV, "ATI FireGL Mobility T2e (M11) NV (AGP)" }, + { PCI_CHIP_RV350_4155, "ATI Radeon 9650" }, { PCI_CHIP_R350_AH, "ATI Radeon 9800SE AH (AGP)" }, { PCI_CHIP_R350_AI, "ATI Radeon 9800 AI (AGP)" }, { PCI_CHIP_R350_AJ, "ATI Radeon 9800 AJ (AGP)" }, @@ -77,6 +79,24 @@ { PCI_CHIP_RV370_5B65, "ATI FireGL D1100 (RV370) 5B65 (PCIE)" }, { PCI_CHIP_RV370_5460, "ATI Radeon Mobility M300 (M22) 5460 (PCIE)" }, { PCI_CHIP_RV370_5464, "ATI FireGL M22 GL 5464 (PCIE)" }, + { PCI_CHIP_RS400_5A41, "ATI Radeon XPRESS 200 5A41 (PCIE)" }, + { PCI_CHIP_RS400_5A42, "ATI Radeon XPRESS 200M 5A42 (PCIE)" }, + { PCI_CHIP_RC410_5A61, "ATI Radeon XPRESS 200 5A61 (PCIE)" }, + { PCI_CHIP_RC410_5A62, "ATI Radeon XPRESS 200M 5A62 (PCIE)" }, + { PCI_CHIP_RS480_5954, "ATI Radeon XPRESS 200 5954 (PCIE)" }, + { PCI_CHIP_RS480_5955, "ATI Radeon XPRESS 200M 5955 (PCIE)" }, + { PCI_CHIP_RS482_5974, "ATI Radeon XPRESS 200 5974 (PCIE)" }, + { PCI_CHIP_RS482_5975, "ATI Radeon XPRESS 200M 5975 (PCIE)" }, + { PCI_CHIP_RV410_5E48, "ATI FireGL V5000 (RV410) (PCIE)" }, + { PCI_CHIP_RV410_564A, "ATI Mobility FireGL V5000 (M26) (PCIE)" }, + { PCI_CHIP_RV410_564B, "ATI Mobility FireGL V5000 (M26) (PCIE)" }, + { PCI_CHIP_RV410_5652, "ATI Mobility Radeon X700 (M26) (PCIE)" }, + { PCI_CHIP_RV410_5653, "ATI Mobility Radeon X700 (M26) (PCIE)" }, + { PCI_CHIP_RV410_5E4B, "ATI Radeon X700 PRO (RV410) (PCIE)" }, + { PCI_CHIP_RV410_5E4A, "ATI Radeon X700 XT (RV410) (PCIE)" }, + { PCI_CHIP_RV410_5E4D, "ATI Radeon X700 (RV410) (PCIE)" }, + { PCI_CHIP_RV410_5E4C, "ATI Radeon X700 SE (RV410) (PCIE)" }, + { PCI_CHIP_RV410_5E4F, "ATI Radeon X700 SE (RV410) (PCIE)" }, { PCI_CHIP_R420_JH, "ATI Radeon X800 (R420) JH (AGP)" }, { PCI_CHIP_R420_JI, "ATI Radeon X800PRO (R420) JI (AGP)" }, { PCI_CHIP_R420_JJ, "ATI Radeon X800SE (R420) JJ (AGP)" }, @@ -85,6 +105,7 @@ { PCI_CHIP_R420_JM, "ATI FireGL X3 (R420) JM (AGP)" }, { PCI_CHIP_R420_JN, "ATI Radeon Mobility 9800 (M18) JN (AGP)" }, { PCI_CHIP_R420_JP, "ATI Radeon X800XT (R420) JP (AGP)" }, + { PCI_CHIP_R420_4A4F, "ATI Radeon X800 SE (R420) (AGP)" }, { PCI_CHIP_R423_UH, "ATI Radeon X800 (R423) UH (PCIE)" }, { PCI_CHIP_R423_UI, "ATI Radeon X800PRO (R423) UI (PCIE)" }, { PCI_CHIP_R423_UJ, "ATI Radeon X800LE (R423) UJ (PCIE)" }, @@ -93,6 +114,24 @@ { PCI_CHIP_R423_UR, "ATI FireGL V5100 (R423) UR (PCIE)" }, { PCI_CHIP_R423_UT, "ATI FireGL V7100 (R423) UT (PCIE)" }, { PCI_CHIP_R423_5D57, "ATI Radeon X800XT (R423) 5D57 (PCIE)" }, + { PCI_CHIP_R423_5550, "ATI FireGL V7100 (R423) (PCIE)" }, + { PCI_CHIP_R430_5D49, "ATI Mobility FireGL V5100 (M28) (PCIE)" }, + { PCI_CHIP_R430_5D4A, "ATI Mobility Radeon X800 (M28) (PCIE)" }, + { PCI_CHIP_R430_5D48, "ATI Mobility Radeon X800 XT (M28) (PCIE)" }, + { PCI_CHIP_R430_554F, "ATI Radeon X800 (R430) (PCIE)" }, + { PCI_CHIP_R430_554D, "ATI Radeon X800 XL (R430) (PCIE)" }, + { PCI_CHIP_R430_554E, "ATI Radeon X800 SE (R430) (PCIE)" }, + { PCI_CHIP_R430_554C, "ATI Radeon X800 XTP (R430) (PCIE)" }, + { PCI_CHIP_R480_5D4C, "ATI Radeon X850 5D4C (PCIE)" }, + { PCI_CHIP_R480_5D50, "ATI Radeon FireGL (R480) GL 5D50 (PCIE)" }, + { PCI_CHIP_R480_5D4E, "ATI Radeon X850 SE (R480) (PCIE)" }, + { PCI_CHIP_R480_5D4F, "ATI Radeon X850 PRO (R480) (PCIE)" }, + { PCI_CHIP_R480_5D52, "ATI Radeon X850 XT (R480) (PCIE)" }, + { PCI_CHIP_R480_5D4D, "ATI Radeon X850 XT PE (R480) (PCIE)" }, + { PCI_CHIP_R481_4B4B, "ATI Radeon X850 PRO (R480) (AGP)" }, + { PCI_CHIP_R481_4B4A, "ATI Radeon X850 SE (R480) (AGP)" }, + { PCI_CHIP_R481_4B49, "ATI Radeon X850 XT (R480) (AGP)" }, + { PCI_CHIP_R481_4B4C, "ATI Radeon X850 XT PE (R480) (AGP)" }, { -1, NULL } }; Index: drivers/ati/radeon_driver.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v retrieving revision 1.46 diff -u -r1.46 radeon_driver.c --- drivers/ati/radeon_driver.c 24 Mar 2005 06:45:51 -0000 1.46 +++ drivers/ati/radeon_driver.c 29 Mar 2005 05:57:34 -0000 @@ -2393,6 +2393,7 @@ case PCI_CHIP_RV280_5961: case PCI_CHIP_RV280_5962: case PCI_CHIP_RV280_5964: + case PCI_CHIP_RV280_5965: info->ChipFamily = CHIP_FAMILY_RV280; break; @@ -2420,6 +2421,7 @@ case PCI_CHIP_RV350_AS: case PCI_CHIP_RV350_AT: case PCI_CHIP_RV350_AV: + case PCI_CHIP_RV350_4155: info->ChipFamily = CHIP_FAMILY_RV350; break; @@ -2451,6 +2453,34 @@ info->ChipFamily = CHIP_FAMILY_RV380; break; + case PCI_CHIP_RS400_5A42: + case PCI_CHIP_RC410_5A62: + case PCI_CHIP_RS480_5955: + case PCI_CHIP_RS482_5975: + info->IsMobility = TRUE; + case PCI_CHIP_RS400_5A41: + case PCI_CHIP_RC410_5A61: + case PCI_CHIP_RS480_5954: + case PCI_CHIP_RS482_5974: + info->ChipFamily = CHIP_FAMILY_RS300; /*CHIP_FAMILY_RS400*/ + info->IsIGP = TRUE; + info->HasSingleDAC = TRUE; /*?*/ + break; + + case PCI_CHIP_RV410_564A: + case PCI_CHIP_RV410_564B: + case PCI_CHIP_RV410_5652: + case PCI_CHIP_RV410_5653: + info->IsMobility = TRUE; + case PCI_CHIP_RV410_5E48: + case PCI_CHIP_RV410_5E4B: + case PCI_CHIP_RV410_5E4A: + case PCI_CHIP_RV410_5E4D: + case PCI_CHIP_RV410_5E4C: + case PCI_CHIP_RV410_5E4F: + info->ChipFamily = CHIP_FAMILY_R420; /* CHIP_FAMILY_RV410*/ + break; + case PCI_CHIP_R420_JN: info->IsMobility = TRUE; case PCI_CHIP_R420_JH: @@ -2460,6 +2490,7 @@ case PCI_CHIP_R420_JL: case PCI_CHIP_R420_JM: case PCI_CHIP_R420_JP: + case PCI_CHIP_R420_4A4F: info->ChipFamily = CHIP_FAMILY_R420; break; @@ -2471,9 +2502,34 @@ case PCI_CHIP_R423_UR: case PCI_CHIP_R423_UT: case PCI_CHIP_R423_5D57: + case PCI_CHIP_R423_5550: info->ChipFamily = CHIP_FAMILY_R420; break; + case PCI_CHIP_R430_5D49: + case PCI_CHIP_R430_5D4A: + case PCI_CHIP_R430_5D48: + info->IsMobility = TRUE; + case PCI_CHIP_R430_554F: + case PCI_CHIP_R430_554D: + case PCI_CHIP_R430_554E: + case PCI_CHIP_R430_554C: + info->ChipFamily = CHIP_FAMILY_R420; /*CHIP_FAMILY_R430*/ + break; + + case PCI_CHIP_R480_5D4C: + case PCI_CHIP_R480_5D50: + case PCI_CHIP_R480_5D4E: + case PCI_CHIP_R480_5D4F: + case PCI_CHIP_R480_5D52: + case PCI_CHIP_R480_5D4D: + case PCI_CHIP_R481_4B4B: + case PCI_CHIP_R481_4B4A: + case PCI_CHIP_R481_4B49: + case PCI_CHIP_R481_4B4C: + info->ChipFamily = CHIP_FAMILY_R420; /*CHIP_FAMILY_R480*/ + break; + default: /* Original Radeon/7200 */ info->ChipFamily = CHIP_FAMILY_RADEON; Index: drivers/ati/radeon_probe.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c,v retrieving revision 1.8 diff -u -r1.8 radeon_probe.c --- drivers/ati/radeon_probe.c 18 Mar 2005 22:36:47 -0000 1.8 +++ drivers/ati/radeon_probe.c 29 Mar 2005 05:57:34 -0000 @@ -90,6 +90,7 @@ { PCI_CHIP_RV280_5961, PCI_CHIP_RV280_5961, RES_SHARED_VGA }, { PCI_CHIP_RV280_5962, PCI_CHIP_RV280_5962, RES_SHARED_VGA }, { PCI_CHIP_RV280_5964, PCI_CHIP_RV280_5964, RES_SHARED_VGA }, + { PCI_CHIP_RV280_5965, PCI_CHIP_RV280_5965, RES_SHARED_VGA }, { PCI_CHIP_RV280_5C61, PCI_CHIP_RV280_5C61, RES_SHARED_VGA }, { PCI_CHIP_RV280_5C63, PCI_CHIP_RV280_5C63, RES_SHARED_VGA }, { PCI_CHIP_R300_AD, PCI_CHIP_R300_AD, RES_SHARED_VGA }, @@ -112,6 +113,7 @@ { PCI_CHIP_RV350_NS, PCI_CHIP_RV350_NS, RES_SHARED_VGA }, { PCI_CHIP_RV350_NT, PCI_CHIP_RV350_NT, RES_SHARED_VGA }, { PCI_CHIP_RV350_NV, PCI_CHIP_RV350_NV, RES_SHARED_VGA }, + { PCI_CHIP_RV350_4155, PCI_CHIP_RV350_4155, RES_SHARED_VGA }, { PCI_CHIP_R350_AH, PCI_CHIP_R350_AH, RES_SHARED_VGA }, { PCI_CHIP_R350_AI, PCI_CHIP_R350_AI, RES_SHARED_VGA }, { PCI_CHIP_R350_AJ, PCI_CHIP_R350_AJ, RES_SHARED_VGA }, @@ -130,6 +132,24 @@ { PCI_CHIP_RV370_5B65, PCI_CHIP_RV370_5B65, RES_SHARED_VGA }, { PCI_CHIP_RV370_5460, PCI_CHIP_RV370_5460, RES_SHARED_VGA }, { PCI_CHIP_RV370_5464, PCI_CHIP_RV370_5464, RES_SHARED_VGA }, + { PCI_CHIP_RS400_5A41, PCI_CHIP_RS400_5A41, RES_SHARED_VGA }, + { PCI_CHIP_RS400_5A42, PCI_CHIP_RS400_5A42, RES_SHARED_VGA }, + { PCI_CHIP_RC410_5A61, PCI_CHIP_RC410_5A61, RES_SHARED_VGA }, + { PCI_CHIP_RC410_5A62, PCI_CHIP_RC410_5A62, RES_SHARED_VGA }, + { PCI_CHIP_RS480_5954, PCI_CHIP_RS480_5954, RES_SHARED_VGA }, + { PCI_CHIP_RS480_5955, PCI_CHIP_RS480_5955, RES_SHARED_VGA }, + { PCI_CHIP_RS482_5974, PCI_CHIP_RS482_5974, RES_SHARED_VGA }, + { PCI_CHIP_RS482_5975, PCI_CHIP_RS482_5975, RES_SHARED_VGA }, + { PCI_CHIP_RV410_5E48, PCI_CHIP_RV410_5E48, RES_SHARED_VGA }, + { PCI_CHIP_RV410_564A, PCI_CHIP_RV410_564A, RES_SHARED_VGA }, + { PCI_CHIP_RV410_564B, PCI_CHIP_RV410_564B, RES_SHARED_VGA }, + { PCI_CHIP_RV410_5652, PCI_CHIP_RV410_5652, RES_SHARED_VGA }, + { PCI_CHIP_RV410_5653, PCI_CHIP_RV410_5653, RES_SHARED_VGA }, + { PCI_CHIP_RV410_5E4B, PCI_CHIP_RV410_5E4B, RES_SHARED_VGA }, + { PCI_CHIP_RV410_5E4A, PCI_CHIP_RV410_5E4A, RES_SHARED_VGA }, + { PCI_CHIP_RV410_5E4D, PCI_CHIP_RV410_5E4D, RES_SHARED_VGA }, + { PCI_CHIP_RV410_5E4C, PCI_CHIP_RV410_5E4C, RES_SHARED_VGA }, + { PCI_CHIP_RV410_5E4F, PCI_CHIP_RV410_5E4F, RES_SHARED_VGA }, { PCI_CHIP_R420_JH, PCI_CHIP_R420_JH, RES_SHARED_VGA }, { PCI_CHIP_R420_JI, PCI_CHIP_R420_JI, RES_SHARED_VGA }, { PCI_CHIP_R420_JJ, PCI_CHIP_R420_JJ, RES_SHARED_VGA }, @@ -138,6 +158,7 @@ { PCI_CHIP_R420_JM, PCI_CHIP_R420_JM, RES_SHARED_VGA }, { PCI_CHIP_R420_JN, PCI_CHIP_R420_JN, RES_SHARED_VGA }, { PCI_CHIP_R420_JP, PCI_CHIP_R420_JP, RES_SHARED_VGA }, + { PCI_CHIP_R420_4A4F, PCI_CHIP_R420_4A4F, RES_SHARED_VGA }, { PCI_CHIP_R423_UH, PCI_CHIP_R423_UH, RES_SHARED_VGA }, { PCI_CHIP_R423_UI, PCI_CHIP_R423_UI, RES_SHARED_VGA }, { PCI_CHIP_R423_UJ, PCI_CHIP_R423_UJ, RES_SHARED_VGA }, @@ -146,6 +167,24 @@ { PCI_CHIP_R423_UR, PCI_CHIP_R423_UR, RES_SHARED_VGA }, { PCI_CHIP_R423_UT, PCI_CHIP_R423_UT, RES_SHARED_VGA }, { PCI_CHIP_R423_5D57, PCI_CHIP_R423_5D57, RES_SHARED_VGA }, + { PCI_CHIP_R423_5550, PCI_CHIP_R423_5550, RES_SHARED_VGA }, + { PCI_CHIP_R430_5D49, PCI_CHIP_R430_5D49, RES_SHARED_VGA }, + { PCI_CHIP_R430_5D4A, PCI_CHIP_R430_5D4A, RES_SHARED_VGA }, + { PCI_CHIP_R430_5D48, PCI_CHIP_R430_5D48, RES_SHARED_VGA }, + { PCI_CHIP_R430_554F, PCI_CHIP_R430_554F, RES_SHARED_VGA }, + { PCI_CHIP_R430_554D, PCI_CHIP_R430_554D, RES_SHARED_VGA }, + { PCI_CHIP_R430_554E, PCI_CHIP_R430_554E, RES_SHARED_VGA }, + { PCI_CHIP_R430_554C, PCI_CHIP_R430_554C, RES_SHARED_VGA }, + { PCI_CHIP_R480_5D4C, PCI_CHIP_R480_5D4C, RES_SHARED_VGA }, + { PCI_CHIP_R480_5D50, PCI_CHIP_R480_5D50, RES_SHARED_VGA }, + { PCI_CHIP_R480_5D4E, PCI_CHIP_R480_5D4E, RES_SHARED_VGA }, + { PCI_CHIP_R480_5D4F, PCI_CHIP_R480_5D4F, RES_SHARED_VGA }, + { PCI_CHIP_R480_5D52, PCI_CHIP_R480_5D52, RES_SHARED_VGA }, + { PCI_CHIP_R480_5D4D, PCI_CHIP_R480_5D4D, RES_SHARED_VGA }, + { PCI_CHIP_R481_4B4B, PCI_CHIP_R481_4B4B, RES_SHARED_VGA }, + { PCI_CHIP_R481_4B4A, PCI_CHIP_R481_4B4A, RES_SHARED_VGA }, + { PCI_CHIP_R481_4B49, PCI_CHIP_R481_4B49, RES_SHARED_VGA }, + { PCI_CHIP_R481_4B4C, PCI_CHIP_R481_4B4C, RES_SHARED_VGA }, { -1, -1, RES_UNDEFINED } };