Merge tag 'topic/drm-misc-2016-08-12' of git://anongit.freedesktop.org/drm-intel into drm-next

- more fence destaging and cleanup (Gustavo&Sumit)
- DRIVER_LEGACY to untangle from DRIVER_MODESET
- drm_mm refactor (Chris)
- fbdev-less compile fies
- clipped plane src/dst rects (Ville)
- + a few mediatek patches that build on top of that (Bibby+Daniel)
- small stuff all over really

* tag 'topic/drm-misc-2016-08-12' of git://anongit.freedesktop.org/drm-intel: (43 commits)
  dma-buf/fence: kerneldoc: remove spurious section header
  dma-buf/fence: kerneldoc: remove unused struct members
  Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle"
  drm: Protect fb_defio in drivers with CONFIG_KMS_FBDEV_EMULATION
  drm/radeon|amgpu: Make fbdev emulation optional
  drm/vmwgfx: select CONFIG_FB
  drm: Remove superflous linux/fb.h includes
  drm/fb-helper: Add a dummy remove_conflicting_framebuffers
  dma-buf/sync_file: only enable fence signalling on poll()
  Documentation: add doc for sync_file_get_fence()
  dma-buf/sync_file: add sync_file_get_fence()
  dma-buf/sync_file: refactor fence storage in struct sync_file
  dma-buf/fence-array: add fence_is_array()
  drm/dp_helper: Rate limit timeout errors from drm_dp_i2c_do_msg()
  drm/dp_helper: Print first error received on failure in drm_dp_dpcd_access()
  drm: Add ratelimited versions of the DRM_DEBUG* macros
  drm: Make sure drm_vblank_no_hw_counter isn't abused
  drm/mediatek: Fix mtk_atomic_complete for runtime_pm
  drm/mediatek: plane: Use FB's format's cpp to compute x offset
  drm/mediatek: plane: Merge mtk_plane_enable into mtk_plane_atomic_update
  ...

1 files changed, 9 insertions, 34 deletions

diff --git a/drivers/gpu/drm/drm_vma_manager.c b/drivers/gpu/drm/drm_vma_manager.c
index f306c8855978..0aef432679f9 100644
--- a/drivers/gpu/drm/drm_vma_manager.c
+++ b/drivers/gpu/drm/drm_vma_manager.c
@@ -86,7 +86,6 @@ void drm_vma_offset_manager_init(struct drm_vma_offset_manager *mgr,
                                  unsigned long page_offset, unsigned long size)
 {
         rwlock_init(&mgr->vm_lock);
-        mgr->vm_addr_space_rb = RB_ROOT;
         drm_mm_init(&mgr->vm_addr_space_mm, page_offset, size);
 }
 EXPORT_SYMBOL(drm_vma_offset_manager_init);
@@ -145,16 +144,16 @@ struct drm_vma_offset_node *drm_vma_offset_lookup_locked(struct drm_vma_offset_m
                                                          unsigned long start,
                                                          unsigned long pages)
 {
-        struct drm_vma_offset_node *node, *best;
+        struct drm_mm_node *node, *best;
         struct rb_node *iter;
         unsigned long offset;
 
-        iter = mgr->vm_addr_space_rb.rb_node;
+        iter = mgr->vm_addr_space_mm.interval_tree.rb_node;
         best = NULL;
 
         while (likely(iter)) {
-                node = rb_entry(iter, struct drm_vma_offset_node, vm_rb);
-                offset = node->vm_node.start;
+                node = rb_entry(iter, struct drm_mm_node, rb);
+                offset = node->start;
                 if (start >= offset) {
                         iter = iter->rb_right;
                         best = node;
@@ -167,38 +166,17 @@ struct drm_vma_offset_node *drm_vma_offset_lookup_locked(struct drm_vma_offset_m
 
         /* verify that the node spans the requested area */
         if (best) {
-                offset = best->vm_node.start + best->vm_node.size;
+                offset = best->start + best->size;
                 if (offset < start + pages)
                         best = NULL;
         }
 
-        return best;
-}
-EXPORT_SYMBOL(drm_vma_offset_lookup_locked);
-
-/* internal helper to link @node into the rb-tree */
-static void _drm_vma_offset_add_rb(struct drm_vma_offset_manager *mgr,
-                                   struct drm_vma_offset_node *node)
-{
-        struct rb_node **iter = &mgr->vm_addr_space_rb.rb_node;
-        struct rb_node *parent = NULL;
-        struct drm_vma_offset_node *iter_node;
-
-        while (likely(*iter)) {
-                parent = *iter;
-                iter_node = rb_entry(*iter, struct drm_vma_offset_node, vm_rb);
+        if (!best)
+                return NULL;
 
-                if (node->vm_node.start < iter_node->vm_node.start)
-                        iter = &(*iter)->rb_left;
-                else if (node->vm_node.start > iter_node->vm_node.start)
-                        iter = &(*iter)->rb_right;
-                else
-                        BUG();
-        }
-
-        rb_link_node(&node->vm_rb, parent, iter);
-        rb_insert_color(&node->vm_rb, &mgr->vm_addr_space_rb);
+        return container_of(best, struct drm_vma_offset_node, vm_node);
 }
+EXPORT_SYMBOL(drm_vma_offset_lookup_locked);
 
 /**
  * drm_vma_offset_add() - Add offset node to manager
@@ -240,8 +218,6 @@ int drm_vma_offset_add(struct drm_vma_offset_manager *mgr,
         if (ret)
                 goto out_unlock;
 
-        _drm_vma_offset_add_rb(mgr, node);
-
 out_unlock:
         write_unlock(&mgr->vm_lock);
         return ret;
@@ -265,7 +241,6 @@ void drm_vma_offset_remove(struct drm_vma_offset_manager *mgr,
         write_lock(&mgr->vm_lock);
 
         if (drm_mm_node_allocated(&node->vm_node)) {
-                rb_erase(&node->vm_rb, &mgr->vm_addr_space_rb);
                 drm_mm_remove_node(&node->vm_node);
                 memset(&node->vm_node, 0, sizeof(node->vm_node));
         }