drm: Merge the drm and drm2 implementations
authorFrançois Tigeot <ftigeot@wolfpond.org>
Sun, 1 Sep 2013 19:38:11 +0000 (21:38 +0200)
committerFrançois Tigeot <ftigeot@wolfpond.org>
Sun, 1 Sep 2013 20:30:22 +0000 (22:30 +0200)
commit5718399f454457d2fede1f011bbf41c5c7070ecf
tree0d045be01df628f9ece5490615cd83cdca1df772
parent7e2c15788a919629853397c448368d2266033666
drm: Merge the drm and drm2 implementations

* Move the drm2 i915 driver to sys/dev/drm/i915kms

* The legacy i915 driver remains untouched

* Only sys/dev/drm/ shall remain
161 files changed:
sys/dev/Makefile
sys/dev/drm/Makefile
sys/dev/drm/ati_pcigart.c
sys/dev/drm/drm.h
sys/dev/drm/drm/Makefile
sys/dev/drm/drmP.h
sys/dev/drm/drm_agpsupport.c
sys/dev/drm/drm_atomic.h
sys/dev/drm/drm_auth.c
sys/dev/drm/drm_bufs.c
sys/dev/drm/drm_context.c
sys/dev/drm/drm_crtc.c [moved from sys/dev/drm2/drm_crtc.c with 99% similarity]
sys/dev/drm/drm_crtc.h [moved from sys/dev/drm2/drm_crtc.h with 99% similarity]
sys/dev/drm/drm_crtc_helper.c [moved from sys/dev/drm2/drm_crtc_helper.c with 99% similarity]
sys/dev/drm/drm_crtc_helper.h [moved from sys/dev/drm2/drm_crtc_helper.h with 100% similarity]
sys/dev/drm/drm_dma.c
sys/dev/drm/drm_dp_helper.h [moved from sys/dev/drm2/drm_dp_helper.h with 100% similarity]
sys/dev/drm/drm_dp_iic_helper.c [moved from sys/dev/drm2/drm_dp_iic_helper.c with 98% similarity]
sys/dev/drm/drm_drawable.c
sys/dev/drm/drm_drv.c
sys/dev/drm/drm_edid.c [moved from sys/dev/drm2/drm_edid.c with 99% similarity]
sys/dev/drm/drm_edid.h [moved from sys/dev/drm2/drm_edid.h with 99% similarity]
sys/dev/drm/drm_edid_modes.h [moved from sys/dev/drm2/drm_edid_modes.h with 99% similarity]
sys/dev/drm/drm_fb_helper.c [moved from sys/dev/drm2/drm_fb_helper.c with 99% similarity]
sys/dev/drm/drm_fb_helper.h [moved from sys/dev/drm2/drm_fb_helper.h with 100% similarity]
sys/dev/drm/drm_fops.c
sys/dev/drm/drm_fourcc.h [moved from sys/dev/drm2/drm_fourcc.h with 100% similarity]
sys/dev/drm/drm_gem.c [moved from sys/dev/drm2/drm_gem.c with 99% similarity]
sys/dev/drm/drm_gem_names.c [moved from sys/dev/drm2/drm_gem_names.c with 98% similarity]
sys/dev/drm/drm_gem_names.h [moved from sys/dev/drm2/drm_gem_names.h with 100% similarity]
sys/dev/drm/drm_global.c [moved from sys/dev/drm2/drm_global.c with 98% similarity]
sys/dev/drm/drm_global.h [moved from sys/dev/drm2/drm_global.h with 100% similarity]
sys/dev/drm/drm_hashtab.h
sys/dev/drm/drm_ioctl.c
sys/dev/drm/drm_irq.c
sys/dev/drm/drm_linux_list.h
sys/dev/drm/drm_linux_list_sort.c [moved from sys/dev/drm2/drm_linux_list_sort.c with 95% similarity]
sys/dev/drm/drm_lock.c
sys/dev/drm/drm_memory.c
sys/dev/drm/drm_mm.c
sys/dev/drm/drm_mm.h
sys/dev/drm/drm_mode.h [moved from sys/dev/drm2/drm_mode.h with 100% similarity]
sys/dev/drm/drm_modes.c [moved from sys/dev/drm2/drm_modes.c with 99% similarity]
sys/dev/drm/drm_pci.c
sys/dev/drm/drm_pciids.h
sys/dev/drm/drm_scatter.c
sys/dev/drm/drm_sman.c
sys/dev/drm/drm_stub.c [moved from sys/dev/drm2/drm_stub.c with 100% similarity]
sys/dev/drm/drm_sysctl.c
sys/dev/drm/drm_vm.c
sys/dev/drm/i915/i915_dma.c
sys/dev/drm/i915/i915_drv.c
sys/dev/drm/i915/i915_drv.h
sys/dev/drm/i915/i915_irq.c
sys/dev/drm/i915/i915_mem.c
sys/dev/drm/i915kms/Makefile [moved from sys/dev/drm2/i915/Makefile with 100% similarity]
sys/dev/drm/i915kms/i915_debug.c [moved from sys/dev/drm2/i915/i915_debug.c with 99% similarity]
sys/dev/drm/i915kms/i915_dma.c [moved from sys/dev/drm2/i915/i915_dma.c with 99% similarity]
sys/dev/drm/i915kms/i915_drm.h [moved from sys/dev/drm2/i915/i915_drm.h with 99% similarity]
sys/dev/drm/i915kms/i915_drv.c [moved from sys/dev/drm2/i915/i915_drv.c with 98% similarity]
sys/dev/drm/i915kms/i915_drv.h [moved from sys/dev/drm2/i915/i915_drv.h with 99% similarity]
sys/dev/drm/i915kms/i915_gem.c [moved from sys/dev/drm2/i915/i915_gem.c with 99% similarity]
sys/dev/drm/i915kms/i915_gem_evict.c [moved from sys/dev/drm2/i915/i915_gem_evict.c with 98% similarity]
sys/dev/drm/i915kms/i915_gem_execbuffer.c [moved from sys/dev/drm2/i915/i915_gem_execbuffer.c with 99% similarity]
sys/dev/drm/i915kms/i915_gem_gtt.c [moved from sys/dev/drm2/i915/i915_gem_gtt.c with 98% similarity]
sys/dev/drm/i915kms/i915_gem_tiling.c [moved from sys/dev/drm2/i915/i915_gem_tiling.c with 99% similarity]
sys/dev/drm/i915kms/i915_irq.c [moved from sys/dev/drm2/i915/i915_irq.c with 99% similarity]
sys/dev/drm/i915kms/i915_reg.h [moved from sys/dev/drm2/i915/i915_reg.h with 100% similarity]
sys/dev/drm/i915kms/i915_suspend.c [moved from sys/dev/drm2/i915/i915_suspend.c with 99% similarity]
sys/dev/drm/i915kms/intel_bios.c [moved from sys/dev/drm2/i915/intel_bios.c with 99% similarity]
sys/dev/drm/i915kms/intel_bios.h [moved from sys/dev/drm2/i915/intel_bios.h with 99% similarity]
sys/dev/drm/i915kms/intel_crt.c [moved from sys/dev/drm2/i915/intel_crt.c with 98% similarity]
sys/dev/drm/i915kms/intel_display.c [moved from sys/dev/drm2/i915/intel_display.c with 99% similarity]
sys/dev/drm/i915kms/intel_dp.c [moved from sys/dev/drm2/i915/intel_dp.c with 99% similarity]
sys/dev/drm/i915kms/intel_drv.h [moved from sys/dev/drm2/i915/intel_drv.h with 98% similarity]
sys/dev/drm/i915kms/intel_fb.c [moved from sys/dev/drm2/i915/intel_fb.c with 96% similarity]
sys/dev/drm/i915kms/intel_hdmi.c [moved from sys/dev/drm2/i915/intel_hdmi.c with 98% similarity]
sys/dev/drm/i915kms/intel_iic.c [moved from sys/dev/drm2/i915/intel_iic.c with 98% similarity]
sys/dev/drm/i915kms/intel_lvds.c [moved from sys/dev/drm2/i915/intel_lvds.c with 99% similarity]
sys/dev/drm/i915kms/intel_modes.c [moved from sys/dev/drm2/i915/intel_modes.c with 95% similarity]
sys/dev/drm/i915kms/intel_opregion.c [moved from sys/dev/drm2/i915/intel_opregion.c with 99% similarity]
sys/dev/drm/i915kms/intel_overlay.c [moved from sys/dev/drm2/i915/intel_overlay.c with 99% similarity]
sys/dev/drm/i915kms/intel_panel.c [moved from sys/dev/drm2/i915/intel_panel.c with 98% similarity]
sys/dev/drm/i915kms/intel_ringbuffer.c [moved from sys/dev/drm2/i915/intel_ringbuffer.c with 99% similarity]
sys/dev/drm/i915kms/intel_ringbuffer.h [moved from sys/dev/drm2/i915/intel_ringbuffer.h with 100% similarity]
sys/dev/drm/i915kms/intel_sdvo.c [moved from sys/dev/drm2/i915/intel_sdvo.c with 99% similarity]
sys/dev/drm/i915kms/intel_sdvo_regs.h [moved from sys/dev/drm2/i915/intel_sdvo_regs.h with 100% similarity]
sys/dev/drm/i915kms/intel_sprite.c [moved from sys/dev/drm2/i915/intel_sprite.c with 98% similarity]
sys/dev/drm/i915kms/intel_tv.c [moved from sys/dev/drm2/i915/intel_tv.c with 99% similarity]
sys/dev/drm/mach64/mach64_dma.c
sys/dev/drm/mach64/mach64_drv.c
sys/dev/drm/mach64/mach64_state.c
sys/dev/drm/mga/mga_dma.c
sys/dev/drm/mga/mga_drv.c
sys/dev/drm/r128/r128_cce.c
sys/dev/drm/r128/r128_drv.c
sys/dev/drm/r128/r128_state.c
sys/dev/drm/radeon/radeon_cp.c
sys/dev/drm/radeon/radeon_cs.c
sys/dev/drm/radeon/radeon_drv.c
sys/dev/drm/radeon/radeon_drv.h
sys/dev/drm/radeon/radeon_mem.c
sys/dev/drm/radeon/radeon_state.c
sys/dev/drm/savage/savage_bci.c
sys/dev/drm/savage/savage_drv.c
sys/dev/drm/savage/savage_state.c
sys/dev/drm/sis/sis_drv.c
sys/dev/drm/sis/sis_ds.c
sys/dev/drm/tdfx/tdfx_drv.c
sys/dev/drm/ttm/ttm_agp_backend.c [moved from sys/dev/drm2/ttm/ttm_agp_backend.c with 95% similarity]
sys/dev/drm/ttm/ttm_bo.c [moved from sys/dev/drm2/ttm/ttm_bo.c with 99% similarity]
sys/dev/drm/ttm/ttm_bo_api.h [moved from sys/dev/drm2/ttm/ttm_bo_api.h with 99% similarity]
sys/dev/drm/ttm/ttm_bo_driver.h [moved from sys/dev/drm2/ttm/ttm_bo_driver.h with 99% similarity]
sys/dev/drm/ttm/ttm_bo_manager.c [moved from sys/dev/drm2/ttm/ttm_bo_manager.c with 96% similarity]
sys/dev/drm/ttm/ttm_bo_util.c [moved from sys/dev/drm2/ttm/ttm_bo_util.c with 99% similarity]
sys/dev/drm/ttm/ttm_bo_vm.c [moved from sys/dev/drm2/ttm/ttm_bo_vm.c with 98% similarity]
sys/dev/drm/ttm/ttm_execbuf_util.c [moved from sys/dev/drm2/ttm/ttm_execbuf_util.c with 97% similarity]
sys/dev/drm/ttm/ttm_execbuf_util.h [moved from sys/dev/drm2/ttm/ttm_execbuf_util.h with 99% similarity]
sys/dev/drm/ttm/ttm_lock.c [moved from sys/dev/drm2/ttm/ttm_lock.c with 99% similarity]
sys/dev/drm/ttm/ttm_lock.h [moved from sys/dev/drm2/ttm/ttm_lock.h with 98% similarity]
sys/dev/drm/ttm/ttm_memory.c [moved from sys/dev/drm2/ttm/ttm_memory.c with 98% similarity]
sys/dev/drm/ttm/ttm_memory.h [moved from sys/dev/drm2/ttm/ttm_memory.h with 100% similarity]
sys/dev/drm/ttm/ttm_module.h [moved from sys/dev/drm2/ttm/ttm_module.h with 100% similarity]
sys/dev/drm/ttm/ttm_object.c [moved from sys/dev/drm2/ttm/ttm_object.c with 98% similarity]
sys/dev/drm/ttm/ttm_object.h [moved from sys/dev/drm2/ttm/ttm_object.h with 99% similarity]
sys/dev/drm/ttm/ttm_page_alloc.c [moved from sys/dev/drm2/ttm/ttm_page_alloc.c with 99% similarity]
sys/dev/drm/ttm/ttm_page_alloc.h [moved from sys/dev/drm2/ttm/ttm_page_alloc.h with 97% similarity]
sys/dev/drm/ttm/ttm_page_alloc_dma.c [moved from sys/dev/drm2/ttm/ttm_page_alloc_dma.c with 100% similarity]
sys/dev/drm/ttm/ttm_placement.h [moved from sys/dev/drm2/ttm/ttm_placement.h with 100% similarity]
sys/dev/drm/ttm/ttm_tt.c [moved from sys/dev/drm2/ttm/ttm_tt.c with 98% similarity]
sys/dev/drm2/Makefile [deleted file]
sys/dev/drm2/drm.h [deleted file]
sys/dev/drm2/drmP.h [deleted file]
sys/dev/drm2/drm_agpsupport.c [deleted file]
sys/dev/drm2/drm_atomic.h [deleted file]
sys/dev/drm2/drm_auth.c [deleted file]
sys/dev/drm2/drm_bufs.c [deleted file]
sys/dev/drm2/drm_context.c [deleted file]
sys/dev/drm2/drm_dma.c [deleted file]
sys/dev/drm2/drm_drawable.c [deleted file]
sys/dev/drm2/drm_drv.c [deleted file]
sys/dev/drm2/drm_fops.c [deleted file]
sys/dev/drm2/drm_hashtab.c [deleted file]
sys/dev/drm2/drm_hashtab.h [deleted file]
sys/dev/drm2/drm_internal.h [deleted file]
sys/dev/drm2/drm_ioctl.c [deleted file]
sys/dev/drm2/drm_irq.c [deleted file]
sys/dev/drm2/drm_linux_list.h [deleted file]
sys/dev/drm2/drm_lock.c [deleted file]
sys/dev/drm2/drm_memory.c [deleted file]
sys/dev/drm2/drm_mm.c [deleted file]
sys/dev/drm2/drm_mm.h [deleted file]
sys/dev/drm2/drm_pci.c [deleted file]
sys/dev/drm2/drm_pciids.h [deleted file]
sys/dev/drm2/drm_sarea.h [deleted file]
sys/dev/drm2/drm_scatter.c [deleted file]
sys/dev/drm2/drm_sman.c [deleted file]
sys/dev/drm2/drm_sman.h [deleted file]
sys/dev/drm2/drm_sysctl.c [deleted file]
sys/dev/drm2/drm_vm.c [deleted file]
sys/dev/drm2/drmn/Makefile [deleted file]