1. 15 Sep, 2014 35 commits
  2. 12 Sep, 2014 5 commits
    • Dave Airlie's avatar
      Merge tag 'topic/drm-header-rework-2014-09-12' of... · 98faa78c
      Dave Airlie authored
      Merge tag 'topic/drm-header-rework-2014-09-12' of git://anongit.freedesktop.org/drm-intel into drm-next
      
      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).
      
      * tag 'topic/drm-header-rework-2014-09-12' of git://anongit.freedesktop.org/drm-intel:
        drm: Move DRM_MAGIC_HASH_ORDER into drm_drv.c
        drm: Move drm_class to drm_internal.h
        drm: Move LOCK_TEST_WITH_RETURN to <drm/drm_legacy.h>
        drm: Move legacy buffer structures to <drm/drm_legacy.h>
        drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h>
        drm: Purge ioctl forward declarations from drmP.h
        drm: unexport drm_global_mutex
        drm: Move piles of functions from drmP.h to drm_internal.h
        drm: Move vblank related module options into drm_irq.c
        drm: Drop drm_sysfs_class from drmP.h
        drm: Move __drm_pci_free to drm_legacy.h
        drm: Create drm legacy driver header
        drm: Move drm_legacy_vma_flush into drm_legacy.h
        drm: Move sg functions into drm_legacy.h
        drm: Move dma functions into drm_legacy.h
      98faa78c
    • Daniel Vetter's avatar
      drm: Move DRM_MAGIC_HASH_ORDER into drm_drv.c · 6865b20a
      Daniel Vetter authored
      Only used in one place ever, so put it right next to that.
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      6865b20a
    • Daniel Vetter's avatar
      00285be8
    • Daniel Vetter's avatar
      drm: Move LOCK_TEST_WITH_RETURN to <drm/drm_legacy.h> · 8f1a2c8d
      Daniel Vetter authored
      Unfortunately we can't move struct drm_lock_data easily since
      it's embedded into struct drm_master. And figuring out where exactly
      this struct should be allocated isn't that simple ...
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      8f1a2c8d
    • Daniel Vetter's avatar
      drm: Move legacy buffer structures to <drm/drm_legacy.h> · ba8286fa
      Daniel Vetter authored
      A few odd cases:
      - mgag200 someho had a totally unused drm_dma_handle_t. Remove it.
      - i915 still uses the legacy pci dma alloc api, so grows an include.
      
      Everything else fairly standard.
      
      v2: Include "drm_legacy.h" in drm.ko source files for consistency.
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      ba8286fa