CVS Update: xc (branch: trunk)

[Eric Anholt]

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

Log message:
  Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/os-support

Modified files:
      xc/programs/Xserver/hw/xfree86/os-support/:
        xf86drm.h xf86drmCompat.h 
      xc/programs/Xserver/hw/xfree86/os-support/bsd/:
        Imakefile 
      xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/:
        Imakefile 
      xc/programs/Xserver/hw/xfree86/os-support/linux/:
        Imakefile 
      xc/programs/Xserver/hw/xfree86/os-support/linux/drm/:
        Imakefile xf86drm.c xf86drmCompat.c 
      xc/programs/Xserver/hw/xfree86/os-support/lynxos/:
        Imakefile 
Removed files:
      xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/:
        Imakefile Makefile.bsd ati_pcigart.h drmP.h 
        drm_agpsupport.h drm_auth.h drm_bufs.h drm_context.h 
        drm_dma.h drm_drawable.h drm_drv.h drm_fops.h drm_ioctl.h 
        drm_lock.h drm_memory.h drm_memory_debug.h 
        drm_os_freebsd.h drm_os_netbsd.h drm_pci.h drm_scatter.h 
        drm_sysctl.h drm_vm.h mga_drv.c r128_drv.c radeon_drv.c 
        sis_drv.c tdfx_drv.c 
      xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/:
        Makefile 
      xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/:
        Makefile 
      xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/:
        Makefile 
      xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/sis/:
        Makefile 
      xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/:
        Makefile 
      xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/:
        Config.in Doxyfile Imakefile Kconfig Makefile.kernel 
        Makefile.linux README.drm ati_pcigart.h dristat.c drmP.h 
        drm_agpsupport.h drm_auth.h drm_bufs.h drm_context.h 
        drm_dma.h drm_drawable.h drm_drv.h drm_fops.h drm_init.h 
        drm_ioctl.h drm_lock.h drm_memory.h drm_memory_debug.h 
        drm_os_linux.h drm_proc.h drm_scatter.h drm_stub.h 
        drm_vm.h drmstat.c gamma.h gamma_context.h gamma_dma.c 
        gamma_drm.h gamma_drv.c gamma_drv.h gamma_lists.h 
        gamma_lock.h gamma_old_dma.h i810.h i810_dma.c i810_drm.h 
        i810_drv.c i810_drv.h i830.h i830_dma.c i830_drm.h 
        i830_drv.c i830_drv.h i830_irq.c mga_drv.c r128_drv.c 
        radeon_drv.c sis_drv.c tdfx_drv.c 
      xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/:
        drm.h drm_sarea.h mga.h mga_dma.c mga_drm.h mga_drv.h 
        mga_irq.c mga_state.c mga_ucode.h mga_warp.c r128.h 
        r128_cce.c r128_drm.h r128_drv.h r128_irq.c r128_state.c 
        radeon.h radeon_cp.c radeon_drm.h radeon_drv.h 
        radeon_irq.c radeon_mem.c radeon_state.c sis.h sis_drm.h 
        sis_drv.h sis_ds.c sis_ds.h sis_mm.c 
  
  Revision      Changes    Path
  1.3           +40 -43    xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h
  1.3           +4 -0      xc/programs/Xserver/hw/xfree86/os-support/xf86drmCompat.h
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
  1.3           +2 -7      xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile
  1.3           +2 -1      xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
  1.4           +2 -7      xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile
  1.3           +169 -42   xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c
  1.3           +1 -0      xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c
  1.3           +1 -1      xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile