git: drm: Replace the i915 driver by i915kms

Francois Tigeot ftigeot at crater.dragonflybsd.org
Thu Sep 12 07:02:06 PDT 2013


commit e3adcf8fcbce54764ec5bd4e133c79456138e35b
Author: François Tigeot <ftigeot at wolfpond.org>
Date:   Thu Sep 12 09:05:08 2013 +0200

    drm: Replace the i915 driver by i915kms
    
    i915kms was already an updated version of i915, there's no need to
    keep maintaining two separate instances of the same driver.

Summary of changes:
 Makefile_upgrade.inc                               |    1 +
 sys/conf/files                                     |   23 +-
 sys/dev/drm/Makefile                               |    2 +-
 sys/dev/drm/i915/Makefile                          |   46 +-
 sys/dev/drm/{i915kms => i915}/i915_debug.c         |    0
 sys/dev/drm/i915/i915_dma.c                        | 1568 ++++++--
 sys/dev/drm/i915/i915_drm.h                        |  252 +-
 sys/dev/drm/i915/i915_drv.c                        |  780 +++-
 sys/dev/drm/i915/i915_drv.h                        | 1167 +++++-
 sys/dev/drm/{i915kms => i915}/i915_gem.c           |    0
 sys/dev/drm/{i915kms => i915}/i915_gem_evict.c     |    0
 .../drm/{i915kms => i915}/i915_gem_execbuffer.c    |    0
 sys/dev/drm/{i915kms => i915}/i915_gem_gtt.c       |    0
 sys/dev/drm/{i915kms => i915}/i915_gem_tiling.c    |    0
 sys/dev/drm/i915/i915_irq.c                        | 2335 ++++++++++--
 sys/dev/drm/i915/i915_reg.h                        | 2746 +++++++++++++-
 sys/dev/drm/i915/i915_suspend.c                    |  820 +++--
 sys/dev/drm/{i915kms => i915}/intel_bios.c         |    0
 sys/dev/drm/{i915kms => i915}/intel_bios.h         |    0
 sys/dev/drm/{i915kms => i915}/intel_crt.c          |    0
 sys/dev/drm/{i915kms => i915}/intel_display.c      |    0
 sys/dev/drm/{i915kms => i915}/intel_dp.c           |    0
 sys/dev/drm/{i915kms => i915}/intel_drv.h          |    0
 sys/dev/drm/{i915kms => i915}/intel_fb.c           |    0
 sys/dev/drm/{i915kms => i915}/intel_hdmi.c         |    0
 sys/dev/drm/{i915kms => i915}/intel_iic.c          |    0
 sys/dev/drm/{i915kms => i915}/intel_lvds.c         |    0
 sys/dev/drm/{i915kms => i915}/intel_modes.c        |    0
 sys/dev/drm/{i915kms => i915}/intel_opregion.c     |    0
 sys/dev/drm/{i915kms => i915}/intel_overlay.c      |    0
 sys/dev/drm/{i915kms => i915}/intel_panel.c        |    0
 sys/dev/drm/{i915kms => i915}/intel_ringbuffer.c   |    0
 sys/dev/drm/{i915kms => i915}/intel_ringbuffer.h   |    0
 sys/dev/drm/{i915kms => i915}/intel_sdvo.c         |    0
 sys/dev/drm/{i915kms => i915}/intel_sdvo_regs.h    |    0
 sys/dev/drm/{i915kms => i915}/intel_sprite.c       |    0
 sys/dev/drm/{i915kms => i915}/intel_tv.c           |    0
 sys/dev/drm/i915kms/Makefile                       |   33 -
 sys/dev/drm/i915kms/i915_dma.c                     | 2070 -----------
 sys/dev/drm/i915kms/i915_drm.h                     |  969 -----
 sys/dev/drm/i915kms/i915_drv.c                     |  814 ----
 sys/dev/drm/i915kms/i915_drv.h                     | 1479 --------
 sys/dev/drm/i915kms/i915_irq.c                     | 2259 ------------
 sys/dev/drm/i915kms/i915_reg.h                     | 3875 --------------------
 sys/dev/drm/i915kms/i915_suspend.c                 |  908 -----
 45 files changed, 8520 insertions(+), 13627 deletions(-)
 rename sys/dev/drm/{i915kms => i915}/i915_debug.c (100%)
 rename sys/dev/drm/{i915kms => i915}/i915_gem.c (100%)
 rename sys/dev/drm/{i915kms => i915}/i915_gem_evict.c (100%)
 rename sys/dev/drm/{i915kms => i915}/i915_gem_execbuffer.c (100%)
 rename sys/dev/drm/{i915kms => i915}/i915_gem_gtt.c (100%)
 rename sys/dev/drm/{i915kms => i915}/i915_gem_tiling.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_bios.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_bios.h (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_crt.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_display.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_dp.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_drv.h (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_fb.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_hdmi.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_iic.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_lvds.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_modes.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_opregion.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_overlay.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_panel.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_ringbuffer.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_ringbuffer.h (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_sdvo.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_sdvo_regs.h (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_sprite.c (100%)
 rename sys/dev/drm/{i915kms => i915}/intel_tv.c (100%)
 delete mode 100644 sys/dev/drm/i915kms/Makefile
 delete mode 100644 sys/dev/drm/i915kms/i915_dma.c
 delete mode 100644 sys/dev/drm/i915kms/i915_drm.h
 delete mode 100644 sys/dev/drm/i915kms/i915_drv.c
 delete mode 100644 sys/dev/drm/i915kms/i915_drv.h
 delete mode 100644 sys/dev/drm/i915kms/i915_irq.c
 delete mode 100644 sys/dev/drm/i915kms/i915_reg.h
 delete mode 100644 sys/dev/drm/i915kms/i915_suspend.c

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/e3adcf8fcbce54764ec5bd4e133c79456138e35b


-- 
DragonFly BSD source repository


More information about the Commits mailing list