Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/drm into nouveau-1

diff --combined linux-core/Makefile
index e3432b5,3aecec4..8792672
--- 1/linux-core/Makefile
--- 2/linux-core/Makefile
+++ b/linux-core/Makefile
@@@ -58,7 -58,7 +58,7 @@@ endi
  
  # Modules for all architectures
  MODULE_LIST := drm.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o \
 -               mach64.o nv.o
 +               mach64.o nv.o nouveau.o
  
  # Modules only for ix86 architectures
  ifneq (,$(findstring 86,$(MACHINE)))
@@@ -75,8 -75,8 +75,8 @@@ DRM_MODULES ?= $(MODULE_LIST
  
  # These definitions are for handling dependencies in the out of kernel build.
  
- DRMSHARED =     drm.h drm_sarea.h
- DRMHEADERS =    drmP.h drm_compat.h drm_os_linux.h $(DRMSHARED)
+ DRMSHARED =     drm.h drm_sarea.h drm_drawable.c
+ DRMHEADERS =    drmP.h drm_compat.h drm_os_linux.h drm.h drm_sarea.h
  COREHEADERS =   drm_core.h drm_sman.h drm_hashtab.h 
  
  TDFXHEADERS =   tdfx_drv.h $(DRMHEADERS)
@@@ -106,12 -106,10 +106,12 @@@ MACH64SHARED =  mach64_drv.h mach64_drm
  NVHEADERS =     nv_drv.h $(DRMHEADERS)
  NVSHARED  =     nv_drv.h
  FFBHEADERS =  ffb_drv.h $(DRMHEADERS)
 +NOUVEAUHEADERS = nouveau_drv.h nouveau_drm.h nouveau_reg.h $(DRMHEADERS)
 +NOUVEAUSHARED =  nouveau_drv.h nouveau_drm.h nouveau_reg.h nouveau_state.c nouveau_fifo.c nouveau_mem.c nouveau_object.c nouveau_irq.c
  
  SHAREDSRC = $(DRMSHARED) $(MGASHARED) $(R128SHARED) $(RADEONSHARED) \
        $(SISSHARED) $(TDFXSHARED) $(VIASHARED) $(MACH64SHARED) \
 -      $(I915SHARED) $(SAVAGESHARED) $(NVSHARED)
 +      $(I915SHARED) $(SAVAGESHARED) $(NVSHARED) $(NOUVEAUSHARED)
  
  PROGS = dristat drmstat
  
@@@ -374,9 -372,6 +374,9 @@@ endi
  ifneq (,$(findstring nv,$(DRM_MODULES)))
  CONFIG_DRM_NV := m
  endif
 +ifneq (,$(findstring nouveau,$(DRM_MODULES)))
 +CONFIG_DRM_NOUVEAU := m
 +endif
  
  # These require AGP support
  
@@@ -407,7 -402,6 +407,7 @@@ $(savage-objs): $(SAVAGEHEADERS
  $(via-objs):  $(VIAHEADERS)
  $(mach64-objs): $(MACH64HEADERS)
  $(nv-objs):     $(NVHEADERS)
 +$(nouveau-objs): $(NOUVEAUHEADERS)
  
  endif
  

diff --combined shared-core/drm_pciids.txt
index cbb30d2,c597708..a6e917a
--- 1/shared-core/drm_pciids.txt
--- 2/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@@ -1,11 -1,11 +1,11 @@@
  [radeon]
- 0x1002 0x3150 CHIP_RV380|CHIP_IS_MOBILITY "ATI Radeon Mobility X600 M24"
- 0x1002 0x3152 CHIP_RV380|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Radeon Mobility X300 M24"
- 0x1002 0x3154 CHIP_RV380|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI FireGL M24 GL"
- 0x1002 0x3E50 CHIP_RV380|CHIP_NEW_MEMMAP "ATI Radeon RV380 X600"
- 0x1002 0x3E54 CHIP_RV380|CHIP_NEW_MEMMAP "ATI FireGL V3200 RV380"
- 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 0x3150 CHIP_RV380|RADEON_IS_MOBILITY "ATI Radeon Mobility X600 M24"
+ 0x1002 0x3152 CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Radeon Mobility X300 M24"
+ 0x1002 0x3154 CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI FireGL M24 GL"
+ 0x1002 0x3E50 CHIP_RV380|RADEON_NEW_MEMMAP "ATI Radeon RV380 X600"
+ 0x1002 0x3E54 CHIP_RV380|RADEON_NEW_MEMMAP "ATI FireGL V3200 RV380"
+ 0x1002 0x4136 CHIP_RS100|RADEON_IS_IGP "ATI Radeon RS100 IGP 320"
+ 0x1002 0x4137 CHIP_RS200|RADEON_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 R300 9600TX"
@@@ -21,35 -21,35 +21,35 @@@
  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 0x4237 CHIP_RS200|RADEON_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_RS200|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS250 Mobility IGP"
+ 0x1002 0x4336 CHIP_RS100|RADEON_IS_IGP|RADEON_IS_MOBILITY "ATI Radeon RS100 Mobility U1"
+ 0x1002 0x4337 CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY "ATI Radeon RS200 Mobility IGP 340M"
+ 0x1002 0x4437 CHIP_RS200|RADEON_IS_IGP|RADEON_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|CHIP_NEW_MEMMAP "ATI Radeon JH R420 X800"
- 0x1002 0x4A49 CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon JI R420 X800 Pro"
- 0x1002 0x4A4A CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon JJ R420 X800 SE"
- 0x1002 0x4A4B CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon JK R420 X800 XT"
- 0x1002 0x4A4C CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon JL R420 X800"
- 0x1002 0x4A4D CHIP_R420|CHIP_NEW_MEMMAP "ATI FireGL JM X3-256"
- 0x1002 0x4A4E CHIP_R420|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Radeon JN R420 Mobility M18"
- 0x1002 0x4A4F CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon JO R420 X800 SE"
- 0x1002 0x4A50 CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon JP R420 X800 XT PE"
- 0x1002 0x4A54 CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon JT R420 AIW X800 VE"
- 0x1002 0x4B49 CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R481 X850 XT"
- 0x1002 0x4B4A CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R481 X850 SE"
- 0x1002 0x4B4B CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R481 X850 Pro"
- 0x1002 0x4B4C CHIP_R420|CHIP_NEW_MEMMAP "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_RV250|CHIP_IS_MOBILITY "ATI Radeon Ld RV250 Mobility 9000 M9"
+ 0x1002 0x4A48 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon JH R420 X800"
+ 0x1002 0x4A49 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon JI R420 X800 Pro"
+ 0x1002 0x4A4A CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon JJ R420 X800 SE"
+ 0x1002 0x4A4B CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon JK R420 X800 XT"
+ 0x1002 0x4A4C CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon JL R420 X800"
+ 0x1002 0x4A4D CHIP_R420|RADEON_NEW_MEMMAP "ATI FireGL JM X3-256"
+ 0x1002 0x4A4E CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Radeon JN R420 Mobility M18"
+ 0x1002 0x4A4F CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon JO R420 X800 SE"
+ 0x1002 0x4A50 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon JP R420 X800 XT PE"
+ 0x1002 0x4A54 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon JT R420 AIW X800 VE"
+ 0x1002 0x4B49 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R481 X850 XT"
+ 0x1002 0x4B4A CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R481 X850 SE"
+ 0x1002 0x4B4B CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R481 X850 Pro"
+ 0x1002 0x4B4C CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R481 X850 XT PE"
+ 0x1002 0x4C57 CHIP_RV200|RADEON_IS_MOBILITY "ATI Radeon LW RV200 Mobility 7500 M7"
+ 0x1002 0x4C58 CHIP_RV200|RADEON_IS_MOBILITY "ATI Radeon LX RV200 Mobility FireGL 7800 M7"
+ 0x1002 0x4C59 CHIP_RV100|RADEON_IS_MOBILITY "ATI Radeon LY RV100 Mobility M6"
+ 0x1002 0x4C5A CHIP_RV100|RADEON_IS_MOBILITY "ATI Radeon LZ RV100 Mobility M6"
+ 0x1002 0x4C64 CHIP_RV250|RADEON_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 0x4C67 CHIP_RV250|RADEON_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 / 9700"
  0x1002 0x4E46 CHIP_R300 "ATI Radeon NF R300 9600TX"
@@@ -58,16 -58,16 +58,16 @@@
  0x1002 0x4E49 CHIP_R350 "ATI Radeon NI R350 9800"
  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 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 0x4E50 CHIP_RV350|RADEON_IS_MOBILITY "ATI Radeon RV350 Mobility 9600 M10 NP"
+ 0x1002 0x4E51 CHIP_RV350|RADEON_IS_MOBILITY "ATI Radeon RV350 Mobility 9600 M10 NQ"
+ 0x1002 0x4E52 CHIP_RV350|RADEON_IS_MOBILITY "ATI Radeon RV350 Mobility 9600 M11 NR"
+ 0x1002 0x4E53 CHIP_RV350|RADEON_IS_MOBILITY "ATI Radeon RV350 Mobility 9600 M10 NS"
+ 0x1002 0x4E54 CHIP_RV350|RADEON_IS_MOBILITY "ATI FireGL T2/T2e"
+ 0x1002 0x4E56 CHIP_RV350|RADEON_IS_MOBILITY "ATI Radeon Mobility 9550"
+ 0x1002 0x5144 CHIP_R100|RADEON_SINGLE_CRTC "ATI Radeon QD R100"
+ 0x1002 0x5145 CHIP_R100|RADEON_SINGLE_CRTC "ATI Radeon QE R100"
+ 0x1002 0x5146 CHIP_R100|RADEON_SINGLE_CRTC "ATI Radeon QF R100"
+ 0x1002 0x5147 CHIP_R100|RADEON_SINGLE_CRTC "ATI Radeon QG R100"
  0x1002 0x5148 CHIP_R200 "ATI Radeon QH R200 8500"
  0x1002 0x514C CHIP_R200 "ATI Radeon QL R200 8500 LE"
  0x1002 0x514D CHIP_R200 "ATI Radeon QM R200 9100"
@@@ -76,59 -76,59 +76,59 @@@
  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 0x5460 CHIP_RV380|CHIP_IS_MOBILITY "ATI Radeon Mobility X300 M22"
- 0x1002 0x5462 CHIP_RV380|CHIP_IS_MOBILITY "ATI Radeon Mobility X600 SE M24C"
- 0x1002 0x5464 CHIP_RV380|CHIP_IS_MOBILITY "ATI FireGL M22 GL 5464"
- 0x1002 0x5548 CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R423 X800"
- 0x1002 0x5549 CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R423 X800 Pro"
- 0x1002 0x554A CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R423 X800 XT PE"
- 0x1002 0x554B CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R423 X800 SE"
- 0x1002 0x554C CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R430 X800 XTP"
- 0x1002 0x554D CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R430 X800 XL"
- 0x1002 0x554E CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R430 X800 SE"
- 0x1002 0x554F CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R430 X800"
- 0x1002 0x5550 CHIP_R420|CHIP_NEW_MEMMAP "ATI FireGL V7100 R423"
- 0x1002 0x5551 CHIP_R420|CHIP_NEW_MEMMAP "ATI FireGL V5100 R423 UQ"
- 0x1002 0x5552 CHIP_R420|CHIP_NEW_MEMMAP "ATI FireGL unknown R423 UR"
- 0x1002 0x5554 CHIP_R420|CHIP_NEW_MEMMAP "ATI FireGL unknown R423 UT"
- 0x1002 0x564A CHIP_RV410|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Mobility FireGL V5000 M26"
- 0x1002 0x564B CHIP_RV410|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Mobility FireGL V5000 M26"
- 0x1002 0x564F CHIP_RV410|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Radeon Mobility X700 XL M26"
- 0x1002 0x5652 CHIP_RV410|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Radeon Mobility X700 M26"
- 0x1002 0x5653 CHIP_RV410|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Radeon Mobility X700 M26"
- 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 0x5460 CHIP_RV380|RADEON_IS_MOBILITY "ATI Radeon Mobility X300 M22"
+ 0x1002 0x5462 CHIP_RV380|RADEON_IS_MOBILITY "ATI Radeon Mobility X600 SE M24C"
+ 0x1002 0x5464 CHIP_RV380|RADEON_IS_MOBILITY "ATI FireGL M22 GL 5464"
+ 0x1002 0x5548 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R423 X800"
+ 0x1002 0x5549 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R423 X800 Pro"
+ 0x1002 0x554A CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R423 X800 XT PE"
+ 0x1002 0x554B CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R423 X800 SE"
+ 0x1002 0x554C CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R430 X800 XTP"
+ 0x1002 0x554D CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R430 X800 XL"
+ 0x1002 0x554E CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R430 X800 SE"
+ 0x1002 0x554F CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R430 X800"
+ 0x1002 0x5550 CHIP_R420|RADEON_NEW_MEMMAP "ATI FireGL V7100 R423"
+ 0x1002 0x5551 CHIP_R420|RADEON_NEW_MEMMAP "ATI FireGL V5100 R423 UQ"
+ 0x1002 0x5552 CHIP_R420|RADEON_NEW_MEMMAP "ATI FireGL unknown R423 UR"
+ 0x1002 0x5554 CHIP_R420|RADEON_NEW_MEMMAP "ATI FireGL unknown R423 UT"
+ 0x1002 0x564A CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Mobility FireGL V5000 M26"
+ 0x1002 0x564B CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Mobility FireGL V5000 M26"
+ 0x1002 0x564F CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Radeon Mobility X700 XL M26"
+ 0x1002 0x5652 CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Radeon Mobility X700 M26"
+ 0x1002 0x5653 CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Radeon Mobility X700 M26"
+ 0x1002 0x5834 CHIP_RS300|RADEON_IS_IGP "ATI Radeon RS300 9100 IGP"
+ 0x1002 0x5835 CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY "ATI Radeon RS300 Mobility IGP"
  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 0x5964 CHIP_RV280 "ATI Radeon RV280 9200 SE"
  0x1002 0x5965 CHIP_RV280 "ATI FireMV 2200 PCI"
  0x1002 0x5969 CHIP_RV100 "ATI ES1000 RN50"
- 0x1002 0x5b60 CHIP_RV380|CHIP_NEW_MEMMAP "ATI Radeon RV370 X300 SE"
- 0x1002 0x5b62 CHIP_RV380|CHIP_NEW_MEMMAP "ATI Radeon RV370 X600 Pro"
- 0x1002 0x5b63 CHIP_RV380|CHIP_NEW_MEMMAP "ATI Radeon RV370 X550"
- 0x1002 0x5b64 CHIP_RV380|CHIP_NEW_MEMMAP "ATI FireGL V3100 (RV370) 5B64"
- 0x1002 0x5b65 CHIP_RV380|CHIP_NEW_MEMMAP "ATI FireMV 2200 PCIE (RV370) 5B65"
- 0x1002 0x5c61 CHIP_RV280|CHIP_IS_MOBILITY "ATI Radeon RV280 Mobility"
- 0x1002 0x5c63 CHIP_RV280|CHIP_IS_MOBILITY "ATI Radeon RV280 Mobility"
- 0x1002 0x5d48 CHIP_R420|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Mobility Radeon X800 XT M28"
- 0x1002 0x5d49 CHIP_R420|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Mobility FireGL V5100 M28"
- 0x1002 0x5d4a CHIP_R420|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Mobility Radeon X800 M28"
- 0x1002 0x5d4c CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R480 X850"
- 0x1002 0x5d4d CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R480 X850 XT PE"
- 0x1002 0x5d4e CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R480 X850 SE"
- 0x1002 0x5d4f CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R480 X850 Pro"
- 0x1002 0x5d50 CHIP_R420|CHIP_NEW_MEMMAP "ATI unknown Radeon / FireGL R480"
- 0x1002 0x5d52 CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R480 X850 XT"
- 0x1002 0x5d57 CHIP_R420|CHIP_NEW_MEMMAP "ATI Radeon R423 X800 XT"
- 0x1002 0x5e48 CHIP_RV410|CHIP_NEW_MEMMAP "ATI FireGL V5000 RV410"
- 0x1002 0x5e4a CHIP_RV410|CHIP_NEW_MEMMAP "ATI Radeon RV410 X700 XT"
- 0x1002 0x5e4b CHIP_RV410|CHIP_NEW_MEMMAP "ATI Radeon RV410 X700 Pro"
- 0x1002 0x5e4c CHIP_RV410|CHIP_NEW_MEMMAP "ATI Radeon RV410 X700 SE"
- 0x1002 0x5e4d CHIP_RV410|CHIP_NEW_MEMMAP "ATI Radeon RV410 X700"
- 0x1002 0x5e4f CHIP_RV410|CHIP_NEW_MEMMAP "ATI Radeon RV410 X700 SE"
- 0x1002 0x7834 CHIP_RS300|CHIP_IS_IGP|CHIP_NEW_MEMMAP "ATI Radeon RS350 9000/9100 IGP"
- 0x1002 0x7835 CHIP_RS300|CHIP_IS_IGP|CHIP_IS_MOBILITY|CHIP_NEW_MEMMAP "ATI Radeon RS350 Mobility IGP"
+ 0x1002 0x5b60 CHIP_RV380|RADEON_NEW_MEMMAP "ATI Radeon RV370 X300 SE"
+ 0x1002 0x5b62 CHIP_RV380|RADEON_NEW_MEMMAP "ATI Radeon RV370 X600 Pro"
+ 0x1002 0x5b63 CHIP_RV380|RADEON_NEW_MEMMAP "ATI Radeon RV370 X550"
+ 0x1002 0x5b64 CHIP_RV380|RADEON_NEW_MEMMAP "ATI FireGL V3100 (RV370) 5B64"
+ 0x1002 0x5b65 CHIP_RV380|RADEON_NEW_MEMMAP "ATI FireMV 2200 PCIE (RV370) 5B65"
+ 0x1002 0x5c61 CHIP_RV280|RADEON_IS_MOBILITY "ATI Radeon RV280 Mobility"
+ 0x1002 0x5c63 CHIP_RV280|RADEON_IS_MOBILITY "ATI Radeon RV280 Mobility"
+ 0x1002 0x5d48 CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Mobility Radeon X800 XT M28"
+ 0x1002 0x5d49 CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Mobility FireGL V5100 M28"
+ 0x1002 0x5d4a CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Mobility Radeon X800 M28"
+ 0x1002 0x5d4c CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R480 X850"
+ 0x1002 0x5d4d CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R480 X850 XT PE"
+ 0x1002 0x5d4e CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R480 X850 SE"
+ 0x1002 0x5d4f CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R480 X850 Pro"
+ 0x1002 0x5d50 CHIP_R420|RADEON_NEW_MEMMAP "ATI unknown Radeon / FireGL R480"
+ 0x1002 0x5d52 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R480 X850 XT"
+ 0x1002 0x5d57 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R423 X800 XT"
+ 0x1002 0x5e48 CHIP_RV410|RADEON_NEW_MEMMAP "ATI FireGL V5000 RV410"
+ 0x1002 0x5e4a CHIP_RV410|RADEON_NEW_MEMMAP "ATI Radeon RV410 X700 XT"
+ 0x1002 0x5e4b CHIP_RV410|RADEON_NEW_MEMMAP "ATI Radeon RV410 X700 Pro"
+ 0x1002 0x5e4c CHIP_RV410|RADEON_NEW_MEMMAP "ATI Radeon RV410 X700 SE"
+ 0x1002 0x5e4d CHIP_RV410|RADEON_NEW_MEMMAP "ATI Radeon RV410 X700"
+ 0x1002 0x5e4f CHIP_RV410|RADEON_NEW_MEMMAP "ATI Radeon RV410 X700 SE"
+ 0x1002 0x7834 CHIP_RS300|RADEON_IS_IGP|RADEON_NEW_MEMMAP "ATI Radeon RS350 9000/9100 IGP"
+ 0x1002 0x7835 CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Radeon RS350 Mobility IGP"
  
  [r128]
  0x1002 0x4c45 0 "ATI Rage 128 Mobility LE (PCI)"
@@@ -186,6 -186,7 +186,7 @@@
  0x1002 0x4c51 0 "3D Rage LT Pro"
  0x1002 0x4c42 0 "3D Rage LT Pro AGP-133"
  0x1002 0x4c44 0 "3D Rage LT Pro AGP-66"
+ 0x1002 0x4759 0 "Rage 3D IICATI 3D RAGE IIC AGP(A12/A13)
  0x1002 0x474c 0 "Rage XC"
  0x1002 0x474f 0 "Rage XL"
  0x1002 0x4752 0 "Rage XL"
@@@ -461,212 -462,3 +462,212 @@@
  0x10DE 0x009C NV40 "NVidia 0x009C"
  0x10DE 0x009D NV40 "NVidia Quadro FX 4500"
  0x10DE 0x009E NV40 "NVidia 0x009E"
 +
 +[nouveau]
 +0x12d2 0x0008 NV_01 "NV1"
 +0x12d2 0x0009 NV_01 "DAC64"
 +0x12d2 0x0018 NV_03 "Riva128"
 +0x12d2 0x0019 NV_03 "Riva128ZX"
 +0x12d2 0x0020 NV_04 "TNT"
 +0x12d2 0x0028 NV_05 "TNT2"
 +0x12d2 0x0029 NV_05 "UTNT2"
 +0x12d2 0x002c NV_05 "VTNT2"
 +0x12d2 0x00a0 NV_05 "ITNT2"
 +0x10de 0x0020 NV_04 "RIVA TNT"
 +0x10de 0x0028 NV_05 "RIVA TNT2/TNT2 Pro"
 +0x10de 0x00a0 NV_05 "Aladdin TNT2"
 +0x10de 0x002c NV_05 "Vanta/Vanta LT"
 +0x10de 0x0029 NV_05 "RIVA TNT2 Ultra"
 +0x10de 0x002d NV_05 "RIVA TNT2 Model 64/Model 64 Pro"
 +0x10de 0x0100 NV_10 "GeForce 256"
 +0x10de 0x0101 NV_10 "GeForce DDR"
 +0x10de 0x0103 NV_10 "Quadro"
 +0x10de 0x0110 NV_10 "GeForce2 MX/MX 400"
 +0x10de 0x0111 NV_10 "GeForce2 MX 100/200"
 +0x10de 0x0113 NV_10 "Quadro2 MXR/EX/Go"
 +0x10de 0x01a0 NV_10|NV_NFORCE "GeForce2 Integrated GPU"
 +0x10de 0x0150 NV_10 "GeForce2 GTS/GeForce2 Pro"
 +0x10de 0x0151 NV_10 "GeForce2 Ti"
 +0x10de 0x0152 NV_10 "GeForce2 Ultra"
 +0x10de 0x0153 NV_10 "Quadro2 Pro"
 +0x10de 0x0170 NV_10 "GeForce4 MX 460"
 +0x10de 0x0171 NV_10 "GeForce4 MX 440"
 +0x10de 0x0172 NV_10 "GeForce4 MX 420"
 +0x10de 0x0173 NV_10 "GeForce4 MX 440-SE"
 +0x10de 0x0178 NV_20 "Quadro4 550 XGL"
 +0x10de 0x017a NV_10 "Quadro NVS"
 +0x10de 0x0181 NV_10 "GeForce4 MX 440 with AGP8X"
 +0x10de 0x0182 NV_10 "GeForce4 MX 440SE with AGP8X"
 +0x10de 0x0183 NV_10 "GeForce4 MX 420 with AGP8X"
 +0x10de 0x0185 NV_10 "GeForce4 MX 4000"
 +0x10de 0x0188 NV_20 "Quadro4 580 XGL"
 +0x10de 0x018a NV_10 "Quadro NVS with AGP8X"
 +0x10de 0x018b NV_20 "Quadro4 380 XGL"
 +0x10de 0x018c NV_10 "Quadro NVS 50 PCI"
 +0x10de 0x01f0 NV_10|NV_NFORCE2 "GeForce4 MX Integrated GPU"
 +0x10de 0x0200 NV_20 "GeForce3"
 +0x10de 0x0201 NV_20 "GeForce3 Ti 200"
 +0x10de 0x0202 NV_20 "GeForce3 Ti 500"
 +0x10de 0x0203 NV_10 "Quadro DCC"
 +0x10de 0x0250 NV_20 "GeForce4 Ti 4600"
 +0x10de 0x0251 NV_20 "GeForce4 Ti 4400"
 +0x10de 0x0252 NV_20 "NV25"
 +0x10de 0x0253 NV_20 "GeForce4 Ti 4200"
 +0x10de 0x0258 NV_20 "Quadro4 900 XGL"
 +0x10de 0x0259 NV_20 "Quadro4 750 XGL"
 +0x10de 0x025b NV_20 "Quadro4 700 XGL"
 +0x10de 0x0280 NV_20 "GeForce4 Ti 4800"
 +0x10de 0x0281 NV_20 "GeForce4 Ti 4200 with AGP8X"
 +0x10de 0x0282 NV_20 "GeForce4 Ti 4800 SE"
 +0x10de 0x0288 NV_20 "Quadro4 980 XGL"
 +0x10de 0x0289 NV_20 "Quadro4 780 XGL"
 +0x10de 0x0301 NV_30 "GeForce FX 5800 Ultra"
 +0x10de 0x0302 NV_30 "GeForce FX 5800"
 +0x10de 0x0308 NV_30 "Quadro FX 2000"
 +0x10de 0x0309 NV_30 "Quadro FX 1000"
 +0x10de 0x0311 NV_30 "GeForce FX 5600 Ultra"
 +0x10de 0x0312 NV_30 "GeForce FX 5600"
 +0x10de 0x0313 NV_30 "NV31"
 +0x10de 0x0314 NV_30 "GeForce FX 5600XT"
 +0x10de 0x0320 NV_30 "GeForce FX 5200"
 +0x10de 0x0321 NV_30 "GeForce FX 5200 Ultra"
 +0x10de 0x0322 NV_30 "GeForce FX 5200"
 +0x10de 0x0323 NV_30 "GeForce FX 5200LE"
 +0x10de 0x0326 NV_30 "GeForce FX 5500"
 +0x10de 0x0327 NV_30 "GeForce FX 5100"
 +0x10de 0x032a NV_10 "Quadro NVS 280 PCI"
 +0x10de 0x032b NV_30 "Quadro FX 500/FX 600"
 +0x10de 0x032f NV_30 "NV34GL"
 +0x10de 0x0330 NV_30 "GeForce FX 5900 Ultra"
 +0x10de 0x0331 NV_30 "GeForce FX 5900"
 +0x10de 0x0332 NV_30 "GeForce FX 5900XT"
 +0x10de 0x0333 NV_30 "GeForce FX 5950 Ultra"
 +0x10de 0x0334 NV_30 "GeForce FX 5900ZT"
 +0x10de 0x0338 NV_30 "Quadro FX 3000"
 +0x10de 0x033f NV_30 "Quadro FX 700"
 +0x10de 0x0341 NV_30 "GeForce FX 5700 Ultra"
 +0x10de 0x0342 NV_30 "GeForce FX 5700"
 +0x10de 0x0343 NV_30 "GeForce FX 5700LE"
 +0x10de 0x0344 NV_30 "GeForce FX 5700VE"
 +0x10de 0x0345 NV_30 "NV36"
 +0x10de 0x034e NV_30 "Quadro FX 1100"
 +0x10de 0x034f NV_30 "NV36GL"
 +0x10de 0x0040 NV_40 "GeForce 6800 Ultra"
 +0x10de 0x0041 NV_40 "GeForce 6800"
 +0x10de 0x0042 NV_40 "GeForce 6800 LE"
 +0x10de 0x0043 NV_40 "NV40"
 +0x10de 0x0045 NV_40 "GeForce 6800 GT"
 +0x10de 0x0049 NV_40 "NV40GL"
 +0x10de 0x004e NV_30 "Quadro FX 4000"
 +0x10de 0x00c0 NV_40 "NV41"
 +0x10de 0x00c1 NV_40 "GeForce 6800"
 +0x10de 0x00c2 NV_40 "GeForce 6800 LE"
 +0x10de 0x00cc NV_30 "Quadro FX Go1400"
 +0x10de 0x00cd NV_30 "Quadro FX 3450/4000 SDI"
 +0x10de 0x00ce NV_30 "Quadro FX 1400"
 +0x10de 0x0140 NV_40 "GeForce 6600 GT"
 +0x10de 0x0141 NV_40 "GeForce 6600"
 +0x10de 0x0142 NV_40 "NV43"
 +0x10de 0x0143 NV_40 "NV43"
 +0x10de 0x0145 NV_40 "GeForce 6610 XL"
 +0x10de 0x014b NV_40 "NV43"
 +0x10de 0x014c NV_40 "NV43GL"
 +0x10de 0x014d NV_40 "NV43GL"
 +0x10de 0x014e NV_30 "Quadro FX 540"
 +0x10de 0x014f NV_40 "GeForce 6200"
 +0x10de 0x0160 NV_40 "NV44"
 +0x10de 0x0161 NV_40 "GeForce 6200 TurboCache(TM)"
 +0x10de 0x0162 NV_40 "NV44"
 +0x10de 0x0163 NV_40 "NV44"
 +0x10de 0x0165 NV_10 "Quadro NVS 285"
 +0x10de 0x016e NV_40 "NV44GL"
 +0x10de 0x0220 NV_40 "NV44"
 +0x10de 0x0221 NV_40 "NV44"
 +0x10de 0x0222 NV_40 "NV44"
 +0x10de 0x0211 NV_40 "GeForce 6800"
 +0x10de 0x0212 NV_40 "GeForce 6800 LE"
 +0x10de 0x0215 NV_40 "GeForce 6800 GT"
 +0x10de 0x00f0 NV_40 "GeForce 6800 Ultra"
 +0x10de 0x00f0 NV_40 "GeForce 6800"
 +0x10de 0x00f1 NV_40 "GeForce 6600 GT"
 +0x10de 0x00f1 NV_40 "GeForce 6600 GT"
 +0x10de 0x00f2 NV_40 "GeForce 6600"
 +0x10de 0x00f2 NV_40 "GeForce 6600"
 +0x10de 0x00f3 NV_40 "GeForce 6200"
 +0x10de 0x00f3 NV_40 "GeForce 6200"
 +0x10de 0x00f8 NV_30 "Quadro FX 4400"
 +0x10de 0x00f8 NV_30 "Quadro FX 3400"
 +0x10de 0x00f8 NV_30 "Quadro FX 3400/4400"
 +0x10de 0x00f9 NV_40 "GeForce 6800 Ultra"
 +0x10de 0x00f9 NV_40 "GeForce 6800 GT"
 +0x10de 0x00f9 NV_40 "GeForce 6800 Series GPU"
 +0x10de 0x0091 NV_10 "GeForce 7800 GTX"
 +0x10de 0x00fa NV_30 "GeForce PCX 5750"
 +0x10de 0x00fa NV_30 "GeForce PCX 5750"
 +0x10de 0x00fb NV_30 "GeForce PCX 5900"
 +0x10de 0x00fb NV_30 "GeForce PCX 5900"
 +0x10de 0x00fc NV_30 "GeForce PCX 5300"
 +0x10de 0x00fc NV_30 "Quadro FX 330"
 +0x10de 0x00fc NV_30 "GeForce PCX 5300"
 +0x10de 0x00fd NV_10 "Quadro NVS 280 PCI-E"
 +0x10de 0x00fd NV_30 "Quadro FX 330"
 +0x10de 0x00fd NV_10 "Quadro PCI-E Series"
 +0x10de 0x00fe NV_30 "Quadro FX 1300"
 +0x10de 0x00fe NV_30 "Quadro FX 1300"
 +0x10de 0x00ff NV_10 "GeForce PCX 4300"
 +0x10de 0x00ff NV_10 "GeForce PCX 4300"
 +0x10de 0x0112 NV_10 "GeForce2 Go"
 +0x10de 0x0174 NV_20 "GeForce4 440 Go"
 +0x10de 0x0175 NV_20 "GeForce4 420 Go"
 +0x10de 0x0176 NV_20 "GeForce4 420 Go 32M"
 +0x10de 0x0177 NV_20 "GeForce4 460 Go"
 +0x10de 0x0179 NV_20 "GeForce4 440 Go 64M"
 +0x10de 0x017d NV_20 "GeForce4 410 Go 16M"
 +0x10de 0x017c NV_20 "Quadro4 500 GoGL"
 +0x10de 0x0186 NV_20 "GeForce4 448 Go"
 +0x10de 0x0187 NV_20 "GeForce4 488 Go"
 +0x10de 0x018d NV_20 "GeForce4 448 Go"
 +0x10de 0x0286 NV_20 "GeForce4 4200 Go"
 +0x10de 0x028c NV_20 "Quadro4 700 GoGL"
 +0x10de 0x0316 NV_30 "NV31M"
 +0x10de 0x0317 NV_30 "NV31M Pro"
 +0x10de 0x031a NV_30 "GeForce FX Go5600"
 +0x10de 0x031b NV_30 "GeForce FX Go5650"
 +0x10de 0x031c NV_30 "Quadro FX Go700"
 +0x10de 0x031d NV_30 "NV31GLM"
 +0x10de 0x031e NV_30 "NV31GLM Pro"
 +0x10de 0x031f NV_30 "NV31GLM Pro"
 +0x10de 0x0324 NV_30 "GeForce FX Go5200"
 +0x10de 0x0325 NV_30 "GeForce FX Go5250"
 +0x10de 0x0328 NV_30 "GeForce FX Go5200 32M/64M"
 +0x10de 0x0329 NV_30 "NV34MAP"
 +0x10de 0x032c NV_30 "GeForce FX Go53xx"
 +0x10de 0x032d NV_30 "GeForce FX Go5100"
 +0x10de 0x0347 NV_30 "GeForce FX Go5700"
 +0x10de 0x0348 NV_30 "GeForce FX Go5700"
 +0x10de 0x0349 NV_30 "NV36M Pro"
 +0x10de 0x034b NV_30 "NV36MAP"
 +0x10de 0x034c NV_30 "Quadro FX Go1000"
 +0x10de 0x00c8 NV_30 "GeForce Go 6800"
 +0x10de 0x00c9 NV_30 "GeForce Go 6800 Ultra"
 +0x10de 0x00cc NV_30 "Quadro FX Go1400"
 +0x10de 0x0140 NV_40 "NV43"
 +0x10de 0x0144 NV_30 "GeForce Go 6600"
 +0x10de 0x0147 NV_40 "NV43"
 +0x10de 0x0148 NV_30 "GeForce Go 6600"
 +0x10de 0x0149 NV_40 "NV43"
 +0x10de 0x014c NV_40 "NV43GL"
 +0x10de 0x0164 NV_30 "GeForce Go 6200"
 +0x10de 0x0167 NV_30 "GeForce Go 6200"
 +0x10de 0x0169 NV_40 "NV44M"
 +0x10de 0x016b NV_40 "NV44GLM"
 +0x10de 0x016c NV_40 "NV44GLM"
 +0x10de 0x016d NV_40 "NV44GLM"
 +0x10de 0x0228 NV_40 "NV44M"
 +0x10de 0x0091 NV_10 "NVIDIA GeForce 7800 GTX"
 +0x10de 0x0092 NV_10 "NVIDIA GeForce 7800 GT"
 +0x10de 0x009d NV_30 "NVIDIA Quadro FX 4500"
 +0x10de 0x0240 NV_40 "NVIDIA GeForce 6150"
 +0x10de 0x0241 NV_40 "NVIDIA GeForce 6150 LE"
 +0x10de 0x0242 NV_40 "NVIDIA GeForce 6100"
 +0x10de 0x0244 NV_40 "NVIDIA GeForce 6150 Go"