CVS Update: xc (branch: trunk)

[Eric Anholt]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	anholt at pdx.	04/06/16 02:44:01

Log message:
  Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers, with
  the following notes:
  
  - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to insecurity.
  - VIA driver converted to new drmContext and drmHandle names.
  - Radeon driver merge conflicted in many places, and MergedFB at least could
    probably use some checking at this point.

Modified files:
      xc/programs/Xserver/hw/xfree86/drivers/ati/:
        Imakefile r128.h r128_accel.c r128_dri.c r128_dri.h 
        r128_driver.c r128_reg.h r128_sarea.h radeon.h radeon.man 
        radeon_accel.c radeon_accelfuncs.c radeon_common.h 
        radeon_cursor.c radeon_dri.c radeon_dri.h 
        radeon_dripriv.h radeon_driver.c radeon_reg.h 
        radeon_sarea.h radeon_video.c 
      xc/programs/Xserver/hw/xfree86/drivers/glint/:
        Imakefile glint_dri.c glint_dripriv.h glint_driver.c 
      xc/programs/Xserver/hw/xfree86/drivers/i810/:
        Imakefile i810.h i810_dri.c i810_dri.h i810_driver.c 
        i810_hwmc.c i830.h i830_dri.c i830_dri.h 
      xc/programs/Xserver/hw/xfree86/drivers/mga/:
        Imakefile mga_dri.c mga_dri.h mga_driver.c mga_sarea.h 
      xc/programs/Xserver/hw/xfree86/drivers/sis/:
        Imakefile sis_dri.c sis_dri.h sis_driver.c 
      xc/programs/Xserver/hw/xfree86/drivers/sunffb/:
        Imakefile ffb_dri.c ffb_drishare.h 
      xc/programs/Xserver/hw/xfree86/drivers/tdfx/:
        Imakefile tdfx_dri.c tdfx_dri.h tdfx_driver.c 
      xc/programs/Xserver/hw/xfree86/drivers/via/:
        Imakefile via_dri.c via_dri.h 
Removed files:
      xc/programs/Xserver/hw/xfree86/drivers/:
        mergescript 
      xc/programs/Xserver/hw/xfree86/drivers/ati/:
        radeon_pci.h 
  
  Revision      Changes    Path
  1.3           +4 -3      xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
  1.3           +9 -9      xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h
  1.3           +1 -0      xc/programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c
  1.3           +17 -8     xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c
  1.3           +2 -3      xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.h
  1.3           +2 -0      xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
  1.3           +29 -66    xc/programs/Xserver/hw/xfree86/drivers/ati/r128_reg.h
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h
  1.3           +62 -15    xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
  1.3           +162 -36   xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man
  1.3           +3 -11     xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c
  1.3           +7 -6      xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accelfuncs.c
  1.3           +23 -11    xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h
  1.3           +13 -76    xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c
  1.3           +34 -33    xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
  1.3           +7 -5      xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.h
  1.3           +2 -2      xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dripriv.h
  1.3           +811 -505  xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
  1.3           +2 -2      xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_sarea.h
  1.3           +145 -49   xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile
  1.3           +18 -14    xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h
  1.3           +1 -0      xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c
  1.3           +2 -2      xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile
  1.3           +5 -5      xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h
  1.3           +35 -25    xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
  1.3           +7 -6      xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h
  1.3           +1 -0      xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
  1.3           +3 -3      xc/programs/Xserver/hw/xfree86/drivers/i810/i810_hwmc.c
  1.3           +2 -2      xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h
  1.3           +23 -16    xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c
  1.3           +7 -6      xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile
  1.3           +13 -8     xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
  1.3           +0 -1      xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h
  1.3           +1 -0      xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
  1.3           +2 -2      xc/programs/Xserver/hw/xfree86/drivers/mga/mga_sarea.h
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile
  1.3           +38 -18    xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.h
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c
  1.3           +2 -1      xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile
  1.3           +6 -6      xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c
  1.3           +6 -6      xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h
  1.3           +2 -2      xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile
  1.3           +14 -10    xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h
  1.3           +1 -0      xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/via/Imakefile
  1.3           +5 -5      xc/programs/Xserver/hw/xfree86/drivers/via/via_dri.c
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/drivers/via/via_dri.h