Module Name: src Committed By: snj Date: Sat Jun 20 23:42:54 UTC 2009
Added Files: src/sys/external/bsd/drm [netbsd-5]: Makefile Makefile.am intel_bufmgr.c intel_bufmgr.h intel_bufmgr_fake.c intel_bufmgr_gem.c intel_bufmgr_priv.h intel_chipset.h libdrm_nouveau.pc.in mm.c mm.h modeprint.c modetest.c 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 src/sys/external/bsd/drm/dist [netbsd-5]: libdrm_intel.pc.in src/sys/external/bsd/drm/dist/bsd-core [netbsd-5]: nouveau_drv.c nouveau_sgdma.c src/sys/external/bsd/drm/dist/libdrm [netbsd-5]: libdrm_lists.h xf86drmMode.c xf86drmMode.h src/sys/external/bsd/drm/dist/scripts [netbsd-5]: create_lk_gpu.sh src/sys/external/bsd/drm/dist/shared-core [netbsd-5]: drm_mode.h i915_reg.h nv50_grctx.h r600_cp.c src/sys/external/bsd/drm/dist/tests [netbsd-5]: gem_basic.c gem_flink.c gem_mmap.c gem_readwrite.c Log Message: Apply patch (requested by mrg in ticket #823): import mesa-drm git from version 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c. -- merge the changes from drm 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c with our changes and the work recently done by Arto Huusko and FUKAUMI Naoki. it includes all the changes arto provided from both mesa-drm and the r6xx-r7xx-support branch. it does not yet include code to handle the (deleted) drm_pciids.h file, but i'll probably just check in a generated one for now. i have not yet merged the changes from outside this dir. from arto's messages to tech-x11: The important change that was needed is that drm_scatter.c was fixed to return pointer to all allocated pages, not just the beginning of the allocated segments. Other changes: - drm_scatter maps COHERENT memory - drm_drawable: drawable handle allocation is done inside lock - drm_memory: when mapping "agp" memory, store offset of mapped area, so that new requests to same offset return the same area instead of trying to remap and fail - drm_vm: use bus_space_mmap for frame buffer and registers - r600_cp.c: ioremapfree allocated gart range - radeon_cp.c: use mtsleep - some memset calls I had added had their args swapped, and no memory was cleared -- add a freshly generated drm_pciids.h -- some minor clean up: - reduce diffs to mesa-drm where possible - fix various formatting issues - netbsd uses major 180 for drm (XXX) To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/sys/external/bsd/drm/Makefile \ src/sys/external/bsd/drm/Makefile.am \ src/sys/external/bsd/drm/intel_bufmgr.c \ src/sys/external/bsd/drm/intel_bufmgr.h \ src/sys/external/bsd/drm/intel_bufmgr_fake.c \ src/sys/external/bsd/drm/intel_bufmgr_gem.c \ src/sys/external/bsd/drm/intel_bufmgr_priv.h \ src/sys/external/bsd/drm/intel_chipset.h \ src/sys/external/bsd/drm/libdrm_nouveau.pc.in \ src/sys/external/bsd/drm/mm.c src/sys/external/bsd/drm/mm.h \ src/sys/external/bsd/drm/modeprint.c src/sys/external/bsd/drm/modetest.c \ src/sys/external/bsd/drm/nouveau_bo.c \ src/sys/external/bsd/drm/nouveau_bo.h \ src/sys/external/bsd/drm/nouveau_channel.c \ src/sys/external/bsd/drm/nouveau_channel.h \ src/sys/external/bsd/drm/nouveau_class.h \ src/sys/external/bsd/drm/nouveau_device.c \ src/sys/external/bsd/drm/nouveau_device.h \ src/sys/external/bsd/drm/nouveau_dma.c \ src/sys/external/bsd/drm/nouveau_dma.h \ src/sys/external/bsd/drm/nouveau_drmif.h \ src/sys/external/bsd/drm/nouveau_fence.c \ src/sys/external/bsd/drm/nouveau_grobj.c \ src/sys/external/bsd/drm/nouveau_grobj.h \ src/sys/external/bsd/drm/nouveau_notifier.c \ src/sys/external/bsd/drm/nouveau_notifier.h \ src/sys/external/bsd/drm/nouveau_private.h \ src/sys/external/bsd/drm/nouveau_pushbuf.c \ src/sys/external/bsd/drm/nouveau_pushbuf.h \ src/sys/external/bsd/drm/nouveau_resource.c \ src/sys/external/bsd/drm/nouveau_resource.h cvs rdiff -u -r0 -r1.1.1.1.2.2 \ src/sys/external/bsd/drm/dist/libdrm_intel.pc.in cvs rdiff -u -r0 -r1.1.1.1.2.2 \ src/sys/external/bsd/drm/dist/bsd-core/nouveau_drv.c \ src/sys/external/bsd/drm/dist/bsd-core/nouveau_sgdma.c cvs rdiff -u -r0 -r1.1.1.1.2.2 \ src/sys/external/bsd/drm/dist/libdrm/libdrm_lists.h \ src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.c \ src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.h cvs rdiff -u -r0 -r1.1.1.1.2.2 \ src/sys/external/bsd/drm/dist/scripts/create_lk_gpu.sh cvs rdiff -u -r0 -r1.1.1.1.2.2 \ src/sys/external/bsd/drm/dist/shared-core/drm_mode.h \ src/sys/external/bsd/drm/dist/shared-core/i915_reg.h \ src/sys/external/bsd/drm/dist/shared-core/nv50_grctx.h cvs rdiff -u -r0 -r1.1.2.2 \ src/sys/external/bsd/drm/dist/shared-core/r600_cp.c cvs rdiff -u -r0 -r1.1.1.1.2.2 \ src/sys/external/bsd/drm/dist/tests/gem_basic.c \ src/sys/external/bsd/drm/dist/tests/gem_flink.c \ src/sys/external/bsd/drm/dist/tests/gem_mmap.c \ src/sys/external/bsd/drm/dist/tests/gem_readwrite.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
diffs are larger than 1MB and have been omitted