Module Name: xsrc
Committed By: mrg
Date: Sat May 22 21:47:44 UTC 2010
Modified Files:
xsrc/external/mit/libdrm/dist: xf86drm.c xf86drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
Removed Files:
xsrc/external/mit/libdrm/dist: libdrm_intel.pc.in
xsrc/external/mit/libdrm/dist/libdrm: ChangeLog Makefile.am Makefile.in
TODO config.h.in libdrm_lists.h xf86drm.c xf86drm.h xf86drmHash.c
xf86drmMode.c xf86drmMode.h xf86drmRandom.c xf86drmSL.c
xsrc/external/mit/libdrm/dist/libdrm/intel: Makefile.am Makefile.in
intel_bufmgr.c intel_bufmgr.h intel_bufmgr_fake.c
intel_bufmgr_gem.c intel_bufmgr_priv.h intel_chipset.h mm.c mm.h
xsrc/external/mit/libdrm/dist/libdrm/nouveau: Makefile.am Makefile.in
libdrm_nouveau.pc.in nouveau_bo.c nouveau_bo.h nouveau_channel.c
nouveau_channel.h nouveau_class.h nouveau_device.c nouveau_device.h
nouveau_dma.c nouveau_dma.h nouveau_drmif.h nouveau_fence.c
nouveau_grobj.c nouveau_grobj.h nouveau_notifier.c
nouveau_notifier.h nouveau_private.h nouveau_pushbuf.c
nouveau_pushbuf.h nouveau_resource.c nouveau_resource.h
xsrc/external/mit/libdrm/dist/shared-core: Makefile.am Makefile.in
drm.h drm_mode.h drm_sarea.h i915_drm.h mach64_drm.h mga_drm.h
nouveau_drm.h r128_drm.h r300_reg.h radeon_drm.h savage_drm.h
sis_drm.h via_3d_reg.h via_drm.h xgi_drm.h
Log Message:
merge libdrm 2.4.20 and re-apply our changes to the moved sources
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libdrm/dist/libdrm_intel.pc.in
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/libdrm/dist/xf86drm.c \
xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libdrm/dist/libdrm/ChangeLog \
xsrc/external/mit/libdrm/dist/libdrm/TODO \
xsrc/external/mit/libdrm/dist/libdrm/libdrm_lists.h \
xsrc/external/mit/libdrm/dist/libdrm/xf86drmMode.c \
xsrc/external/mit/libdrm/dist/libdrm/xf86drmMode.h
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libdrm/dist/libdrm/Makefile.am \
xsrc/external/mit/libdrm/dist/libdrm/Makefile.in \
xsrc/external/mit/libdrm/dist/libdrm/config.h.in \
xsrc/external/mit/libdrm/dist/libdrm/xf86drmHash.c \
xsrc/external/mit/libdrm/dist/libdrm/xf86drmRandom.c \
xsrc/external/mit/libdrm/dist/libdrm/xf86drmSL.c
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/libdrm/dist/libdrm/xf86drm.c \
xsrc/external/mit/libdrm/dist/libdrm/xf86drm.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/libdrm/intel/Makefile.am \
xsrc/external/mit/libdrm/dist/libdrm/intel/Makefile.in \
xsrc/external/mit/libdrm/dist/libdrm/intel/intel_bufmgr.c \
xsrc/external/mit/libdrm/dist/libdrm/intel/intel_bufmgr.h \
xsrc/external/mit/libdrm/dist/libdrm/intel/intel_bufmgr_fake.c \
xsrc/external/mit/libdrm/dist/libdrm/intel/intel_bufmgr_priv.h \
xsrc/external/mit/libdrm/dist/libdrm/intel/intel_chipset.h \
xsrc/external/mit/libdrm/dist/libdrm/intel/mm.c \
xsrc/external/mit/libdrm/dist/libdrm/intel/mm.h
cvs rdiff -u -r1.3 -r0 \
xsrc/external/mit/libdrm/dist/libdrm/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/Makefile.am \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/Makefile.in \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/libdrm_nouveau.pc.in \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_bo.c \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_bo.h \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_channel.c \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_channel.h \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_class.h \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_device.c \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_device.h \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_dma.c \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_dma.h \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_drmif.h \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_fence.c \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_grobj.c \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_grobj.h \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_notifier.c \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_notifier.h \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_private.h \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_pushbuf.c \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_pushbuf.h \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_resource.c \
xsrc/external/mit/libdrm/dist/libdrm/nouveau/nouveau_resource.h
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libdrm/dist/shared-core/Makefile.am \
xsrc/external/mit/libdrm/dist/shared-core/Makefile.in \
xsrc/external/mit/libdrm/dist/shared-core/drm_sarea.h \
xsrc/external/mit/libdrm/dist/shared-core/i915_drm.h \
xsrc/external/mit/libdrm/dist/shared-core/mach64_drm.h \
xsrc/external/mit/libdrm/dist/shared-core/mga_drm.h \
xsrc/external/mit/libdrm/dist/shared-core/r128_drm.h \
xsrc/external/mit/libdrm/dist/shared-core/r300_reg.h \
xsrc/external/mit/libdrm/dist/shared-core/radeon_drm.h \
xsrc/external/mit/libdrm/dist/shared-core/savage_drm.h \
xsrc/external/mit/libdrm/dist/shared-core/via_3d_reg.h \
xsrc/external/mit/libdrm/dist/shared-core/via_drm.h
cvs rdiff -u -r1.4 -r0 xsrc/external/mit/libdrm/dist/shared-core/drm.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/shared-core/drm_mode.h \
xsrc/external/mit/libdrm/dist/shared-core/nouveau_drm.h \
xsrc/external/mit/libdrm/dist/shared-core/sis_drm.h \
xsrc/external/mit/libdrm/dist/shared-core/xgi_drm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
