git: drm: Merge the drm and drm2 implementations

Francois Tigeot ftigeot at crater.dragonflybsd.org
Sun Sep 1 13:31:51 PDT 2013


commit 5718399f454457d2fede1f011bbf41c5c7070ecf
Author: François Tigeot <ftigeot at wolfpond.org>
Date:   Sun Sep 1 21:38:11 2013 +0200

    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

Summary of changes:
 sys/dev/Makefile                                   |    1 -
 sys/dev/drm/Makefile                               |    2 +-
 sys/dev/drm/ati_pcigart.c                          |   14 +-
 sys/dev/drm/drm.h                                  |   79 +-
 sys/dev/drm/drm/Makefile                           |   44 +-
 sys/dev/drm/drmP.h                                 |  601 +++++++--
 sys/dev/drm/drm_agpsupport.c                       |   29 +-
 sys/dev/drm/drm_atomic.h                           |    4 +
 sys/dev/drm/drm_auth.c                             |   21 +-
 sys/dev/drm/drm_bufs.c                             |  164 ++-
 sys/dev/drm/drm_context.c                          |   51 +-
 sys/dev/{drm2 => drm}/drm_crtc.c                   |   10 +-
 sys/dev/{drm2 => drm}/drm_crtc.h                   |    4 +-
 sys/dev/{drm2 => drm}/drm_crtc_helper.c            |   10 +-
 sys/dev/{drm2 => drm}/drm_crtc_helper.h            |    0
 sys/dev/drm/drm_dma.c                              |   19 +-
 sys/dev/{drm2 => drm}/drm_dp_helper.h              |    0
 sys/dev/{drm2 => drm}/drm_dp_iic_helper.c          |    6 +-
 sys/dev/drm/drm_drawable.c                         |   52 +-
 sys/dev/drm/drm_drv.c                              |  389 ++++--
 sys/dev/{drm2 => drm}/drm_edid.c                   |    6 +-
 sys/dev/{drm2 => drm}/drm_edid.h                   |    2 +-
 sys/dev/{drm2 => drm}/drm_edid_modes.h             |    4 +-
 sys/dev/{drm2 => drm}/drm_fb_helper.c              |    8 +-
 sys/dev/{drm2 => drm}/drm_fb_helper.h              |    0
 sys/dev/drm/drm_fops.c                             |  150 ++-
 sys/dev/{drm2 => drm}/drm_fourcc.h                 |    0
 sys/dev/{drm2 => drm}/drm_gem.c                    |    6 +-
 sys/dev/{drm2 => drm}/drm_gem_names.c              |    4 +-
 sys/dev/{drm2 => drm}/drm_gem_names.h              |    0
 sys/dev/{drm2 => drm}/drm_global.c                 |    4 +-
 sys/dev/{drm2 => drm}/drm_global.h                 |    0
 sys/dev/drm/drm_hashtab.h                          |    4 +-
 sys/dev/drm/drm_ioctl.c                            |   80 +-
 sys/dev/drm/drm_irq.c                              | 1225 +++++++++++++----
 sys/dev/drm/drm_linux_list.h                       |   72 +-
 sys/dev/{drm2 => drm}/drm_linux_list_sort.c        |    5 +-
 sys/dev/drm/drm_lock.c                             |   16 +-
 sys/dev/drm/drm_memory.c                           |   18 +-
 sys/dev/drm/drm_mm.c                               |  620 ++++++---
 sys/dev/drm/drm_mm.h                               |  102 +-
 sys/dev/{drm2 => drm}/drm_mode.h                   |    0
 sys/dev/{drm2 => drm}/drm_modes.c                  |    6 +-
 sys/dev/drm/drm_pci.c                              |   17 +-
 sys/dev/drm/drm_pciids.h                           |   30 +-
 sys/dev/drm/drm_scatter.c                          |   28 +-
 sys/dev/drm/drm_sman.c                             |   25 +-
 sys/dev/{drm2 => drm}/drm_stub.c                   |    0
 sys/dev/drm/drm_sysctl.c                           |  133 +-
 sys/dev/drm/drm_vm.c                               |  134 +-
 sys/dev/drm/i915/i915_dma.c                        |   28 +-
 sys/dev/drm/i915/i915_drv.c                        |   12 +-
 sys/dev/drm/i915/i915_drv.h                        |    2 +-
 sys/dev/drm/i915/i915_irq.c                        |   20 +-
 sys/dev/drm/i915/i915_mem.c                        |   12 +-
 sys/dev/{drm2/i915 => drm/i915kms}/Makefile        |    0
 sys/dev/{drm2/i915 => drm/i915kms}/i915_debug.c    |   12 +-
 sys/dev/{drm2/i915 => drm/i915kms}/i915_dma.c      |   12 +-
 sys/dev/{drm2/i915 => drm/i915kms}/i915_drm.h      |    2 +-
 sys/dev/{drm2/i915 => drm/i915kms}/i915_drv.c      |   18 +-
 sys/dev/{drm2/i915 => drm/i915kms}/i915_drv.h      |    8 +-
 sys/dev/{drm2/i915 => drm/i915kms}/i915_gem.c      |   12 +-
 .../{drm2/i915 => drm/i915kms}/i915_gem_evict.c    |    8 +-
 .../i915 => drm/i915kms}/i915_gem_execbuffer.c     |   10 +-
 sys/dev/{drm2/i915 => drm/i915kms}/i915_gem_gtt.c  |   10 +-
 .../{drm2/i915 => drm/i915kms}/i915_gem_tiling.c   |    8 +-
 sys/dev/{drm2/i915 => drm/i915kms}/i915_irq.c      |   10 +-
 sys/dev/{drm2/i915 => drm/i915kms}/i915_reg.h      |    0
 sys/dev/{drm2/i915 => drm/i915kms}/i915_suspend.c  |    8 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_bios.c    |   12 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_bios.h    |    2 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_crt.c     |   16 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_display.c |   16 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_dp.c      |   16 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_drv.h     |   10 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_fb.c      |   14 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_hdmi.c    |   14 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_iic.c     |   14 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_lvds.c    |   14 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_modes.c   |   12 +-
 .../{drm2/i915 => drm/i915kms}/intel_opregion.c    |    8 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_overlay.c |   12 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_panel.c   |    8 +-
 .../{drm2/i915 => drm/i915kms}/intel_ringbuffer.c  |   12 +-
 .../{drm2/i915 => drm/i915kms}/intel_ringbuffer.h  |    0
 sys/dev/{drm2/i915 => drm/i915kms}/intel_sdvo.c    |   18 +-
 .../{drm2/i915 => drm/i915kms}/intel_sdvo_regs.h   |    0
 sys/dev/{drm2/i915 => drm/i915kms}/intel_sprite.c  |   12 +-
 sys/dev/{drm2/i915 => drm/i915kms}/intel_tv.c      |   14 +-
 sys/dev/drm/mach64/mach64_dma.c                    |   13 +-
 sys/dev/drm/mach64/mach64_drv.c                    |    4 +-
 sys/dev/drm/mach64/mach64_state.c                  |    8 +-
 sys/dev/drm/mga/mga_dma.c                          |    4 +-
 sys/dev/drm/mga/mga_drv.c                          |    4 +-
 sys/dev/drm/r128/r128_cce.c                        |    3 +-
 sys/dev/drm/r128/r128_drv.c                        |    4 +-
 sys/dev/drm/r128/r128_state.c                      |   68 +-
 sys/dev/drm/radeon/radeon_cp.c                     |   12 +-
 sys/dev/drm/radeon/radeon_cs.c                     |    6 +-
 sys/dev/drm/radeon/radeon_drv.c                    |    4 +-
 sys/dev/drm/radeon/radeon_drv.h                    |    2 +-
 sys/dev/drm/radeon/radeon_mem.c                    |   12 +-
 sys/dev/drm/radeon/radeon_state.c                  |   10 +-
 sys/dev/drm/savage/savage_bci.c                    |    9 +-
 sys/dev/drm/savage/savage_drv.c                    |    4 +-
 sys/dev/drm/savage/savage_state.c                  |    9 +-
 sys/dev/drm/sis/sis_drv.c                          |    4 +-
 sys/dev/drm/sis/sis_ds.c                           |    4 +-
 sys/dev/drm/tdfx/tdfx_drv.c                        |    4 +-
 sys/dev/{drm2 => drm}/ttm/ttm_agp_backend.c        |   10 +-
 sys/dev/{drm2 => drm}/ttm/ttm_bo.c                 |    8 +-
 sys/dev/{drm2 => drm}/ttm/ttm_bo_api.h             |    2 +-
 sys/dev/{drm2 => drm}/ttm/ttm_bo_driver.h          |   10 +-
 sys/dev/{drm2 => drm}/ttm/ttm_bo_manager.c         |   10 +-
 sys/dev/{drm2 => drm}/ttm/ttm_bo_util.c            |    6 +-
 sys/dev/{drm2 => drm}/ttm/ttm_bo_vm.c              |    8 +-
 sys/dev/{drm2 => drm}/ttm/ttm_execbuf_util.c       |    8 +-
 sys/dev/{drm2 => drm}/ttm/ttm_execbuf_util.h       |    2 +-
 sys/dev/{drm2 => drm}/ttm/ttm_lock.c               |    4 +-
 sys/dev/{drm2 => drm}/ttm/ttm_lock.h               |    6 +-
 sys/dev/{drm2 => drm}/ttm/ttm_memory.c             |    8 +-
 sys/dev/{drm2 => drm}/ttm/ttm_memory.h             |    0
 sys/dev/{drm2 => drm}/ttm/ttm_module.h             |    0
 sys/dev/{drm2 => drm}/ttm/ttm_object.c             |    8 +-
 sys/dev/{drm2 => drm}/ttm/ttm_object.h             |    4 +-
 sys/dev/{drm2 => drm}/ttm/ttm_page_alloc.c         |    6 +-
 sys/dev/{drm2 => drm}/ttm/ttm_page_alloc.h         |    4 +-
 sys/dev/{drm2 => drm}/ttm/ttm_page_alloc_dma.c     |    0
 sys/dev/{drm2 => drm}/ttm/ttm_placement.h          |    0
 sys/dev/{drm2 => drm}/ttm/ttm_tt.c                 |   10 +-
 sys/dev/drm2/Makefile                              |    3 -
 sys/dev/drm2/drm.h                                 | 1213 -----------------
 sys/dev/drm2/drmP.h                                | 1421 --------------------
 sys/dev/drm2/drm_agpsupport.c                      |  416 ------
 sys/dev/drm2/drm_atomic.h                          |   96 --
 sys/dev/drm2/drm_auth.c                            |  188 ---
 sys/dev/drm2/drm_bufs.c                            | 1123 ----------------
 sys/dev/drm2/drm_context.c                         |  310 -----
 sys/dev/drm2/drm_dma.c                             |  137 --
 sys/dev/drm2/drm_drawable.c                        |  173 ---
 sys/dev/drm2/drm_drv.c                             | 1069 ---------------
 sys/dev/drm2/drm_fops.c                            |  259 ----
 sys/dev/drm2/drm_hashtab.c                         |  178 ---
 sys/dev/drm2/drm_hashtab.h                         |   66 -
 sys/dev/drm2/drm_internal.h                        |   42 -
 sys/dev/drm2/drm_ioctl.c                           |  318 -----
 sys/dev/drm2/drm_irq.c                             | 1221 -----------------
 sys/dev/drm2/drm_linux_list.h                      |  175 ---
 sys/dev/drm2/drm_lock.c                            |  197 ---
 sys/dev/drm2/drm_memory.c                          |  121 --
 sys/dev/drm2/drm_mm.c                              |  597 --------
 sys/dev/drm2/drm_mm.h                              |  186 ---
 sys/dev/drm2/drm_pci.c                             |  125 --
 sys/dev/drm2/drm_pciids.h                          |  770 -----------
 sys/dev/drm2/drm_sarea.h                           |   86 --
 sys/dev/drm2/drm_scatter.c                         |  129 --
 sys/dev/drm2/drm_sman.c                            |  349 -----
 sys/dev/drm2/drm_sman.h                            |  178 ---
 sys/dev/drm2/drm_sysctl.c                          |  365 -----
 sys/dev/drm2/drm_vm.c                              |  229 ----
 sys/dev/drm2/drmn/Makefile                         |   48 -
 161 files changed, 3504 insertions(+), 13201 deletions(-)
 rename sys/dev/{drm2 => drm}/drm_crtc.c (99%)
 rename sys/dev/{drm2 => drm}/drm_crtc.h (99%)
 rename sys/dev/{drm2 => drm}/drm_crtc_helper.c (99%)
 rename sys/dev/{drm2 => drm}/drm_crtc_helper.h (100%)
 rename sys/dev/{drm2 => drm}/drm_dp_helper.h (100%)
 rename sys/dev/{drm2 => drm}/drm_dp_iic_helper.c (98%)
 rename sys/dev/{drm2 => drm}/drm_edid.c (99%)
 rename sys/dev/{drm2 => drm}/drm_edid.h (99%)
 rename sys/dev/{drm2 => drm}/drm_edid_modes.h (99%)
 rename sys/dev/{drm2 => drm}/drm_fb_helper.c (99%)
 rename sys/dev/{drm2 => drm}/drm_fb_helper.h (100%)
 rename sys/dev/{drm2 => drm}/drm_fourcc.h (100%)
 rename sys/dev/{drm2 => drm}/drm_gem.c (99%)
 rename sys/dev/{drm2 => drm}/drm_gem_names.c (98%)
 rename sys/dev/{drm2 => drm}/drm_gem_names.h (100%)
 rename sys/dev/{drm2 => drm}/drm_global.c (98%)
 rename sys/dev/{drm2 => drm}/drm_global.h (100%)
 rename sys/dev/{drm2 => drm}/drm_linux_list_sort.c (95%)
 rename sys/dev/{drm2 => drm}/drm_mode.h (100%)
 rename sys/dev/{drm2 => drm}/drm_modes.c (99%)
 rename sys/dev/{drm2 => drm}/drm_stub.c (100%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/Makefile (100%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_debug.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_dma.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_drm.h (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_drv.c (98%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_drv.h (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_gem.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_gem_evict.c (98%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_gem_execbuffer.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_gem_gtt.c (98%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_gem_tiling.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_irq.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_reg.h (100%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/i915_suspend.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_bios.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_bios.h (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_crt.c (98%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_display.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_dp.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_drv.h (98%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_fb.c (96%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_hdmi.c (98%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_iic.c (98%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_lvds.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_modes.c (95%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_opregion.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_overlay.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_panel.c (98%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_ringbuffer.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_ringbuffer.h (100%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_sdvo.c (99%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_sdvo_regs.h (100%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_sprite.c (98%)
 rename sys/dev/{drm2/i915 => drm/i915kms}/intel_tv.c (99%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_agp_backend.c (95%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_bo.c (99%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_bo_api.h (99%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_bo_driver.h (99%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_bo_manager.c (96%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_bo_util.c (99%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_bo_vm.c (98%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_execbuf_util.c (97%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_execbuf_util.h (99%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_lock.c (99%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_lock.h (98%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_memory.c (98%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_memory.h (100%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_module.h (100%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_object.c (98%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_object.h (99%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_page_alloc.c (99%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_page_alloc.h (97%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_page_alloc_dma.c (100%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_placement.h (100%)
 rename sys/dev/{drm2 => drm}/ttm/ttm_tt.c (98%)
 delete mode 100644 sys/dev/drm2/Makefile
 delete mode 100644 sys/dev/drm2/drm.h
 delete mode 100644 sys/dev/drm2/drmP.h
 delete mode 100644 sys/dev/drm2/drm_agpsupport.c
 delete mode 100644 sys/dev/drm2/drm_atomic.h
 delete mode 100644 sys/dev/drm2/drm_auth.c
 delete mode 100644 sys/dev/drm2/drm_bufs.c
 delete mode 100644 sys/dev/drm2/drm_context.c
 delete mode 100644 sys/dev/drm2/drm_dma.c
 delete mode 100644 sys/dev/drm2/drm_drawable.c
 delete mode 100644 sys/dev/drm2/drm_drv.c
 delete mode 100644 sys/dev/drm2/drm_fops.c
 delete mode 100644 sys/dev/drm2/drm_hashtab.c
 delete mode 100644 sys/dev/drm2/drm_hashtab.h
 delete mode 100644 sys/dev/drm2/drm_internal.h
 delete mode 100644 sys/dev/drm2/drm_ioctl.c
 delete mode 100644 sys/dev/drm2/drm_irq.c
 delete mode 100644 sys/dev/drm2/drm_linux_list.h
 delete mode 100644 sys/dev/drm2/drm_lock.c
 delete mode 100644 sys/dev/drm2/drm_memory.c
 delete mode 100644 sys/dev/drm2/drm_mm.c
 delete mode 100644 sys/dev/drm2/drm_mm.h
 delete mode 100644 sys/dev/drm2/drm_pci.c
 delete mode 100644 sys/dev/drm2/drm_pciids.h
 delete mode 100644 sys/dev/drm2/drm_sarea.h
 delete mode 100644 sys/dev/drm2/drm_scatter.c
 delete mode 100644 sys/dev/drm2/drm_sman.c
 delete mode 100644 sys/dev/drm2/drm_sman.h
 delete mode 100644 sys/dev/drm2/drm_sysctl.c
 delete mode 100644 sys/dev/drm2/drm_vm.c
 delete mode 100644 sys/dev/drm2/drmn/Makefile

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/5718399f454457d2fede1f011bbf41c5c7070ecf


-- 
DragonFly BSD source repository



More information about the Commits mailing list