CVS Update: xc (branch: )

[Ian Romanick]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	idr at gabe.freedesktop.org	05/06/15 11:32:09

xc/extras/drm

Update of /cvs/xorg/xc/extras/drm
In directory gabe:/tmp/cvs-serv24284

Log Message:
DRM 20050615 import

Status:

Vendor Tag:	DRM
Release Tags:	DRM-20050615
		
U xc/extras/drm/bsd/mach64_drv.c
U xc/extras/drm/bsd/drm_memory_debug.h
U xc/extras/drm/bsd/Makefile
U xc/extras/drm/bsd/drm_drawable.h
U xc/extras/drm/bsd/mga_drv.c
U xc/extras/drm/bsd/drm_memory.h
U xc/extras/drm/bsd/tdfx_drv.c
U xc/extras/drm/bsd/ati_pcigart.h
U xc/extras/drm/bsd/drm_linux_list.h
U xc/extras/drm/bsd/drm_context.h
U xc/extras/drm/bsd/radeon_drv.c
U xc/extras/drm/bsd/drm_dma.h
U xc/extras/drm/bsd/drm_drv.h
U xc/extras/drm/bsd/drm_irq.h
U xc/extras/drm/bsd/drm_pci.h
U xc/extras/drm/bsd/sis_drv.c
U xc/extras/drm/bsd/drm_ioctl.h
U xc/extras/drm/bsd/drm_scatter.h
U xc/extras/drm/bsd/drmP.h
U xc/extras/drm/bsd/drm_os_netbsd.h
U xc/extras/drm/bsd/drm_vm.h
U xc/extras/drm/bsd/drm_os_freebsd.h
U xc/extras/drm/bsd/drm_agpsupport.h
U xc/extras/drm/bsd/r128_drv.c
U xc/extras/drm/bsd/drm_auth.h
U xc/extras/drm/bsd/drm_bufs.h
U xc/extras/drm/bsd/drm_fops.h
U xc/extras/drm/bsd/drm_sysctl.h
U xc/extras/drm/bsd/.cvsignore
U xc/extras/drm/bsd/drm_lock.h
N xc/extras/drm/bsd/i915_drv.c
U xc/extras/drm/bsd/mga/Makefile
U xc/extras/drm/bsd/mga/.cvsignore
U xc/extras/drm/bsd/sis/Makefile
U xc/extras/drm/bsd/sis/.cvsignore
N xc/extras/drm/bsd/i915/Makefile
U xc/extras/drm/bsd/r128/Makefile
U xc/extras/drm/bsd/r128/.cvsignore
U xc/extras/drm/bsd/tdfx/Makefile
U xc/extras/drm/bsd/tdfx/.cvsignore
U xc/extras/drm/bsd/mach64/Makefile
U xc/extras/drm/bsd/mach64/.cvsignore
U xc/extras/drm/bsd/radeon/Makefile
U xc/extras/drm/bsd/radeon/.cvsignore
U xc/extras/drm/linux/drm_stub.h
U xc/extras/drm/linux/mach64_drv.c
U xc/extras/drm/linux/drm_memory_debug.h
C xc/extras/drm/linux/Makefile
U xc/extras/drm/linux/drm_drawable.h
U xc/extras/drm/linux/ffb.h
U xc/extras/drm/linux/mga_drv.c
U xc/extras/drm/linux/drm_memory.h
U xc/extras/drm/linux/tdfx_drv.c
U xc/extras/drm/linux/savage.h
U xc/extras/drm/linux/ati_pcigart.h
C xc/extras/drm/linux/Makefile.kernel
U xc/extras/drm/linux/drm_context.h
U xc/extras/drm/linux/radeon_drv.c
U xc/extras/drm/linux/Kconfig
U xc/extras/drm/linux/drm_dma.h
C xc/extras/drm/linux/drm_drv.h
U xc/extras/drm/linux/drm_irq.h
U xc/extras/drm/linux/drm_pci.h
U xc/extras/drm/linux/sis_drv.c
U xc/extras/drm/linux/drm_ioctl.h
U xc/extras/drm/linux/drm_scatter.h
U xc/extras/drm/linux/i810.h
U xc/extras/drm/linux/i830.h
C xc/extras/drm/linux/drmP.h
U xc/extras/drm/linux/drm_vm.h
U xc/extras/drm/linux/README.drm
C xc/extras/drm/linux/drm_os_linux.h
U xc/extras/drm/linux/drm_compat.h
U xc/extras/drm/linux/i810_dma.c
U xc/extras/drm/linux/i810_drm.h
U xc/extras/drm/linux/i810_drv.c
U xc/extras/drm/linux/i810_drv.h
U xc/extras/drm/linux/savage_dma.c
U xc/extras/drm/linux/savage_drm.h
U xc/extras/drm/linux/savage_drv.c
U xc/extras/drm/linux/savage_drv.h
U xc/extras/drm/linux/ffb_drv.c
U xc/extras/drm/linux/ffb_drv.h
U xc/extras/drm/linux/drm_agpsupport.h
U xc/extras/drm/linux/r128_drv.c
U xc/extras/drm/linux/drm_auth.h
U xc/extras/drm/linux/drm_bufs.h
N xc/extras/drm/linux/drm_core.h
U xc/extras/drm/linux/drm_fops.h
U xc/extras/drm/linux/Config.in
U xc/extras/drm/linux/i830_dma.c
U xc/extras/drm/linux/i830_drm.h
U xc/extras/drm/linux/i830_drv.c
U xc/extras/drm/linux/i830_drv.h
U xc/extras/drm/linux/i830_irq.c
U xc/extras/drm/linux/drm_init.h
U xc/extras/drm/linux/.cvsignore
U xc/extras/drm/linux/ffb_context.c
U xc/extras/drm/linux/drm_lock.h
U xc/extras/drm/linux/Doxyfile
C xc/extras/drm/linux/i915_drv.c
U xc/extras/drm/linux/drm_proc.h
N xc/extras/drm/tests/Makefile
U xc/extras/drm/tests/dristat.c
U xc/extras/drm/tests/drmstat.c
U xc/extras/drm/scripts/create_lk_drm.sh
U xc/extras/drm/scripts/create_bsd_pci_lists.sh
U xc/extras/drm/scripts/create_linux_pci_lists.sh
N xc/extras/drm/bsd-core/mach64_drv.c
N xc/extras/drm/bsd-core/Makefile
N xc/extras/drm/bsd-core/drm_drawable.c
N xc/extras/drm/bsd-core/mga_drv.c
N xc/extras/drm/bsd-core/drm_memory.c
N xc/extras/drm/bsd-core/tdfx_drv.c
N xc/extras/drm/bsd-core/drm_atomic.h
N xc/extras/drm/bsd-core/ati_pcigart.c
N xc/extras/drm/bsd-core/drm_linux_list.h
N xc/extras/drm/bsd-core/drm_context.c
N xc/extras/drm/bsd-core/radeon_drv.c
N xc/extras/drm/bsd-core/drm_dma.c
N xc/extras/drm/bsd-core/drm_drv.c
N xc/extras/drm/bsd-core/drm_irq.c
N xc/extras/drm/bsd-core/drm_pci.c
N xc/extras/drm/bsd-core/sis_drv.c
N xc/extras/drm/bsd-core/drm_ioctl.c
N xc/extras/drm/bsd-core/drm_scatter.c
N xc/extras/drm/bsd-core/drmP.h
N xc/extras/drm/bsd-core/drm_vm.c
N xc/extras/drm/bsd-core/savage_drv.c
N xc/extras/drm/bsd-core/drm_agpsupport.c
N xc/extras/drm/bsd-core/r128_drv.c
N xc/extras/drm/bsd-core/drm_auth.c
N xc/extras/drm/bsd-core/drm_bufs.c
N xc/extras/drm/bsd-core/drm_fops.c
N xc/extras/drm/bsd-core/drm_sysctl.c
N xc/extras/drm/bsd-core/.cvsignore
N xc/extras/drm/bsd-core/drm_lock.c
N xc/extras/drm/bsd-core/i915_drv.c
N xc/extras/drm/bsd-core/drm/Makefile
N xc/extras/drm/bsd-core/drm/.cvsignore
N xc/extras/drm/bsd-core/mga/Makefile
N xc/extras/drm/bsd-core/mga/.cvsignore
N xc/extras/drm/bsd-core/sis/Makefile
N xc/extras/drm/bsd-core/sis/.cvsignore
N xc/extras/drm/bsd-core/i915/Makefile
N xc/extras/drm/bsd-core/i915/.cvsignore
N xc/extras/drm/bsd-core/r128/Makefile
N xc/extras/drm/bsd-core/r128/.cvsignore
N xc/extras/drm/bsd-core/tdfx/Makefile
N xc/extras/drm/bsd-core/tdfx/.cvsignore
N xc/extras/drm/bsd-core/mach64/Makefile
N xc/extras/drm/bsd-core/mach64/.cvsignore
N xc/extras/drm/bsd-core/radeon/Makefile
N xc/extras/drm/bsd-core/radeon/.cvsignore
N xc/extras/drm/bsd-core/savage/Makefile
N xc/extras/drm/bsd-core/savage/.cvsignore
N xc/extras/drm/libdrm/Makefile
U xc/extras/drm/libdrm/xf86drmHash.c
U xc/extras/drm/libdrm/xf86drmSL.c
U xc/extras/drm/libdrm/xf86drm.c
U xc/extras/drm/libdrm/xf86drm.h
U xc/extras/drm/libdrm/xf86drmCompat.c
N xc/extras/drm/libdrm/xf86drmCompat.h
U xc/extras/drm/libdrm/xf86drmRandom.c
N xc/extras/drm/linux-core/drm_stub.c
N xc/extras/drm/linux-core/mach64_drv.c
N xc/extras/drm/linux-core/drm_memory_debug.c
N xc/extras/drm/linux-core/drm_memory_debug.h
N xc/extras/drm/linux-core/Makefile
N xc/extras/drm/linux-core/drm_sysfs.c
N xc/extras/drm/linux-core/drm_drawable.c
N xc/extras/drm/linux-core/mga_drv.c
N xc/extras/drm/linux-core/drm_memory.c
N xc/extras/drm/linux-core/drm_memory.h
N xc/extras/drm/linux-core/tdfx_drv.c
N xc/extras/drm/linux-core/ati_pcigart.c
N xc/extras/drm/linux-core/Makefile.kernel
N xc/extras/drm/linux-core/drm_context.c
N xc/extras/drm/linux-core/radeon_i2c.c
N xc/extras/drm/linux-core/radeon_i2c.h
N xc/extras/drm/linux-core/radeon_drv.c
N xc/extras/drm/linux-core/Kconfig
N xc/extras/drm/linux-core/drm_dma.c
N xc/extras/drm/linux-core/drm_drv.c
N xc/extras/drm/linux-core/drm_irq.c
N xc/extras/drm/linux-core/drm_pci.c
N xc/extras/drm/linux-core/sis_drv.c
N xc/extras/drm/linux-core/drm_ioctl.c
N xc/extras/drm/linux-core/drm_scatter.c
N xc/extras/drm/linux-core/drmP.h
N xc/extras/drm/linux-core/drm_pm.c
N xc/extras/drm/linux-core/drm_vm.c
N xc/extras/drm/linux-core/README.drm
N xc/extras/drm/linux-core/drm_os_linux.h
N xc/extras/drm/linux-core/drm_compat.h
N xc/extras/drm/linux-core/i810_dma.c
N xc/extras/drm/linux-core/i810_drm.h
N xc/extras/drm/linux-core/i810_drv.c
N xc/extras/drm/linux-core/i810_drv.h
N xc/extras/drm/linux-core/savage_drv.c
N xc/extras/drm/linux-core/ffb_drv.c
N xc/extras/drm/linux-core/ffb_drv.h
N xc/extras/drm/linux-core/drm_agpsupport.c
N xc/extras/drm/linux-core/r128_drv.c
N xc/extras/drm/linux-core/drm_auth.c
N xc/extras/drm/linux-core/drm_bufs.c
N xc/extras/drm/linux-core/drm_core.h
N xc/extras/drm/linux-core/drm_fops.c
N xc/extras/drm/linux-core/Config.in
N xc/extras/drm/linux-core/i830_dma.c
N xc/extras/drm/linux-core/i830_drm.h
N xc/extras/drm/linux-core/i830_drv.c
N xc/extras/drm/linux-core/i830_drv.h
N xc/extras/drm/linux-core/i830_irq.c
N xc/extras/drm/linux-core/ffb_context.c
N xc/extras/drm/linux-core/drm_lock.c
N xc/extras/drm/linux-core/Doxyfile
N xc/extras/drm/linux-core/i915_drv.c
N xc/extras/drm/linux-core/drm_proc.c
N xc/extras/drm/linux-core/imagine_drv.c
U xc/extras/drm/shared/mach64_dma.c
U xc/extras/drm/shared/mach64_drm.h
U xc/extras/drm/shared/mach64_drv.h
U xc/extras/drm/shared/mach64_irq.c
U xc/extras/drm/shared/mga_ucode.h
U xc/extras/drm/shared/mach64_state.c
N xc/extras/drm/shared/via_verifier.c
N xc/extras/drm/shared/via_verifier.h
C xc/extras/drm/shared/drm.h
U xc/extras/drm/shared/mga_dma.c
U xc/extras/drm/shared/mga_drm.h
U xc/extras/drm/shared/mga_drv.h
U xc/extras/drm/shared/mga.h
U xc/extras/drm/shared/mga_irq.c
U xc/extras/drm/shared/sis.h
U xc/extras/drm/shared/radeon_state.c
U xc/extras/drm/shared/via.h
U xc/extras/drm/shared/r128_state.c
U xc/extras/drm/shared/mach64.h
N xc/extras/drm/shared/via_video.c
U xc/extras/drm/shared/sis_ds.c
U xc/extras/drm/shared/sis_ds.h
U xc/extras/drm/shared/sis_mm.c
C xc/extras/drm/shared/drm_pciids.txt
U xc/extras/drm/shared/radeon.h
U xc/extras/drm/shared/radeon_drm.h
U xc/extras/drm/shared/radeon_drv.h
U xc/extras/drm/shared/radeon_irq.c
U xc/extras/drm/shared/radeon_mem.c
U xc/extras/drm/shared/sis_drm.h
U xc/extras/drm/shared/sis_drv.h
C xc/extras/drm/shared/i915.h
N xc/extras/drm/shared/via_dma.c
U xc/extras/drm/shared/via_drm.h
U xc/extras/drm/shared/via_drv.c
U xc/extras/drm/shared/via_drv.h
U xc/extras/drm/shared/via_irq.c
U xc/extras/drm/shared/via_map.c
U xc/extras/drm/shared/r128.h
U xc/extras/drm/shared/tdfx.h
U xc/extras/drm/shared/r128_cce.c
U xc/extras/drm/shared/r128_drm.h
U xc/extras/drm/shared/r128_drv.h
U xc/extras/drm/shared/drm_sarea.h
U xc/extras/drm/shared/r128_irq.c
U xc/extras/drm/shared/mga_warp.c
U xc/extras/drm/shared/radeon_cp.c
U xc/extras/drm/shared/via_ds.c
U xc/extras/drm/shared/via_ds.h
U xc/extras/drm/shared/via_mm.c
U xc/extras/drm/shared/via_mm.h
N xc/extras/drm/shared/via_3d_reg.h
U xc/extras/drm/shared/i915_dma.c
U xc/extras/drm/shared/i915_drm.h
C xc/extras/drm/shared/i915_drv.h
U xc/extras/drm/shared/i915_irq.c
U xc/extras/drm/shared/i915_mem.c
U xc/extras/drm/shared/mga_state.c
N xc/extras/drm/shared-core/mach64_dma.c
N xc/extras/drm/shared-core/mach64_drm.h
N xc/extras/drm/shared-core/mach64_drv.h
N xc/extras/drm/shared-core/mach64_irq.c
N xc/extras/drm/shared-core/mga_ucode.h
N xc/extras/drm/shared-core/mach64_state.c
N xc/extras/drm/shared-core/via_verifier.c
N xc/extras/drm/shared-core/via_verifier.h
N xc/extras/drm/shared-core/drm.h
N xc/extras/drm/shared-core/mga_dma.c
N xc/extras/drm/shared-core/mga_drm.h
N xc/extras/drm/shared-core/mga_drv.h
N xc/extras/drm/shared-core/mga_irq.c
N xc/extras/drm/shared-core/radeon_state.c
N xc/extras/drm/shared-core/tdfx_drv.h
N xc/extras/drm/shared-core/r128_state.c
N xc/extras/drm/shared-core/via_video.c
N xc/extras/drm/shared-core/sis_ds.c
N xc/extras/drm/shared-core/sis_ds.h
N xc/extras/drm/shared-core/sis_mm.c
N xc/extras/drm/shared-core/drm_pciids.txt
N xc/extras/drm/shared-core/savage_state.c
N xc/extras/drm/shared-core/radeon_drm.h
N xc/extras/drm/shared-core/radeon_drv.h
N xc/extras/drm/shared-core/radeon_irq.c
N xc/extras/drm/shared-core/radeon_mem.c
N xc/extras/drm/shared-core/sis_drm.h
N xc/extras/drm/shared-core/sis_drv.h
N xc/extras/drm/shared-core/i915_pm.c
N xc/extras/drm/shared-core/via_dma.c
N xc/extras/drm/shared-core/via_drm.h
N xc/extras/drm/shared-core/via_drv.c
N xc/extras/drm/shared-core/via_drv.h
N xc/extras/drm/shared-core/via_irq.c
N xc/extras/drm/shared-core/via_map.c
N xc/extras/drm/shared-core/savage_bci.c
N xc/extras/drm/shared-core/savage_drm.h
N xc/extras/drm/shared-core/savage_drv.h
N xc/extras/drm/shared-core/r128_cce.c
N xc/extras/drm/shared-core/r128_drm.h
N xc/extras/drm/shared-core/r128_drv.h
N xc/extras/drm/shared-core/drm_sarea.h
N xc/extras/drm/shared-core/r128_irq.c
N xc/extras/drm/shared-core/mga_warp.c
N xc/extras/drm/shared-core/radeon_cp.c
N xc/extras/drm/shared-core/via_ds.c
N xc/extras/drm/shared-core/via_ds.h
N xc/extras/drm/shared-core/via_mm.c
N xc/extras/drm/shared-core/via_mm.h
N xc/extras/drm/shared-core/via_3d_reg.h
N xc/extras/drm/shared-core/i915_dma.c
N xc/extras/drm/shared-core/i915_drm.h
N xc/extras/drm/shared-core/i915_drv.h
N xc/extras/drm/shared-core/i915_irq.c
N xc/extras/drm/shared-core/i915_mem.c
N xc/extras/drm/shared-core/imagine_drv.h
N xc/extras/drm/shared-core/mga_state.c
N xc/extras/drm/linux-2.6/README

10 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jDRM:yesterday -jDRM xc/extras/drm