[PULL] topic/drm-header-rework

Daniel Vetter daniel.vetter at ffwll.ch
Fri Sep 12 08:38:47 PDT 2014


Hi Dave,

So here's the header cleanup, rebased on top of drm-next. Two new header
files are created here:

- drivers/gpu/drm/drm_internal.h for non-legacy drm.ko private
  declarations.

- include/drm/drm_legacy.h for legacy interfaces used by non-kms drivers.

And of course lots fo stuff gets shuffled into the already existing
drivers/gpu/drm/drm_legacy.h for drm.ko internal stuff.

topic branch smoke-tested in drm-intel-nightly for a bit. And the 0day
tester also worked through it (and found a few places I didn't add a
static to functions).

There's still two pull requests besides that one:
- topic/core-stuff, as usual - I'll send you that soon
- Last i915 feature pull for 3.18 which will happen only in a week. As
  discussed on irc QA needs that to test it, but otherwise it's frozen and
  already in linux-next anyway.

Cheers, Daniel


The following changes since commit edbaae5a5cab89de0e64b8c03ebd9a8d5d266550:

  Merge tag 'topic/vblank-rework-2014-09-12' of git://anongit.freedesktop.org/drm-intel into drm-next (2014-09-12 19:04:53 +1000)

are available in the git repository at:

  git://anongit.freedesktop.org/drm-intel tags/topic/drm-header-rework-2014-09-12

for you to fetch changes up to 6865b20ad354548a045c74a388eb37afe1ad5174:

  drm: Move DRM_MAGIC_HASH_ORDER into drm_drv.c (2014-09-12 15:28:14 +0200)

----------------------------------------------------------------
Daniel Vetter (15):
      drm: Move dma functions into drm_legacy.h
      drm: Move sg functions into drm_legacy.h
      drm: Move drm_legacy_vma_flush into drm_legacy.h
      drm: Create drm legacy driver header
      drm: Move __drm_pci_free to drm_legacy.h
      drm: Drop drm_sysfs_class from drmP.h
      drm: Move vblank related module options into drm_irq.c
      drm: Move piles of functions from drmP.h to drm_internal.h
      drm: unexport drm_global_mutex
      drm: Purge ioctl forward declarations from drmP.h
      drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h>
      drm: Move legacy buffer structures to <drm/drm_legacy.h>
      drm: Move LOCK_TEST_WITH_RETURN to <drm/drm_legacy.h>
      drm: Move drm_class to drm_internal.h
      drm: Move DRM_MAGIC_HASH_ORDER into drm_drv.c

 drivers/gpu/drm/drm_auth.c            |   1 +
 drivers/gpu/drm/drm_bufs.c            |   4 +-
 drivers/gpu/drm/drm_crtc.c            |   1 +
 drivers/gpu/drm/drm_debugfs.c         |   1 +
 drivers/gpu/drm/drm_dma.c             |  11 +-
 drivers/gpu/drm/drm_drv.c             |  16 +-
 drivers/gpu/drm/drm_fops.c            |   4 +-
 drivers/gpu/drm/drm_gem.c             |   1 +
 drivers/gpu/drm/drm_info.c            |   1 +
 drivers/gpu/drm/drm_internal.h        |  95 ++++++++++++
 drivers/gpu/drm/drm_ioctl.c           | 247 +++++++++++++++---------------
 drivers/gpu/drm/drm_irq.c             |  15 ++
 drivers/gpu/drm/drm_legacy.h          |  18 +++
 drivers/gpu/drm/drm_lock.c            |   1 +
 drivers/gpu/drm/drm_memory.c          |  12 +-
 drivers/gpu/drm/drm_pci.c             |   5 +-
 drivers/gpu/drm/drm_prime.c           |   1 +
 drivers/gpu/drm/drm_scatter.c         |   9 +-
 drivers/gpu/drm/drm_sysfs.c           |   1 +
 drivers/gpu/drm/drm_vm.c              |   2 +-
 drivers/gpu/drm/i810/i810_dma.c       |  12 +-
 drivers/gpu/drm/i810/i810_drv.h       |   2 +
 drivers/gpu/drm/i915/i915_dma.c       |   1 +
 drivers/gpu/drm/i915/i915_drv.h       |   9 +-
 drivers/gpu/drm/mga/mga_dma.c         |  28 ++--
 drivers/gpu/drm/mga/mga_drv.h         |   2 +
 drivers/gpu/drm/mgag200/mgag200_drv.h |   2 -
 drivers/gpu/drm/r128/r128_cce.c       |  22 +--
 drivers/gpu/drm/r128/r128_drv.h       |   2 +
 drivers/gpu/drm/radeon/r600_cp.c      |  24 +--
 drivers/gpu/drm/radeon/radeon_cp.c    |  24 +--
 drivers/gpu/drm/radeon/radeon_drv.h   |   1 +
 drivers/gpu/drm/savage/savage_bci.c   |  16 +-
 drivers/gpu/drm/savage/savage_drv.h   |   2 +
 drivers/gpu/drm/sis/sis_drv.h         |   2 +
 drivers/gpu/drm/via/via_dma.c         |   4 +-
 drivers/gpu/drm/via/via_drv.h         |   2 +
 drivers/gpu/drm/via/via_map.c         |   4 +-
 drivers/gpu/drm/via/via_verifier.c    |   1 +
 include/drm/ati_pcigart.h             |   2 +
 include/drm/drmP.h                    | 279 ++--------------------------------
 include/drm/drm_legacy.h              | 202 ++++++++++++++++++++++++
 42 files changed, 588 insertions(+), 501 deletions(-)
 create mode 100644 drivers/gpu/drm/drm_internal.h
 create mode 100644 include/drm/drm_legacy.h

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch


More information about the dri-devel mailing list