Merge branch 'drm-mm-cleanup' into drm-next

* drm-mm-cleanup:
  radeon: move blit functions to radeon_asic.h
  radeon: kill decls for inline functions
  radeon: consolidate asic-specific function decls for r600 & later
  drm/radeon: kill radeon_bo->gobj pointer
  drm/radeon: introduce gem_to_radeon_bo helper
  drm/radeon: embed struct drm_gem_object
  drm: mm: add helper to unwind scan state
  drm: mm: add api for embedding struct drm_mm_node
  drm: mm: extract node insert helper functions
  drm: mm: track free areas implicitly
  drm/nouveau: don't munge in drm_mm internals

1 files changed, 37 insertions, 12 deletions

diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
index e39177778601..b1e7809e5e15 100644
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
@@ -42,23 +42,25 @@
 #endif
 
 struct drm_mm_node {
-        struct list_head free_stack;
         struct list_head node_list;
-        unsigned free : 1;
+        struct list_head hole_stack;
+        unsigned hole_follows : 1;
         unsigned scanned_block : 1;
         unsigned scanned_prev_free : 1;
         unsigned scanned_next_free : 1;
+        unsigned scanned_preceeds_hole : 1;
+        unsigned allocated : 1;
         unsigned long start;
         unsigned long size;
         struct drm_mm *mm;
 };
 
 struct drm_mm {
-        /* List of free memory blocks, most recently freed ordered. */
-        struct list_head free_stack;
-        /* List of all memory nodes, ordered according to the (increasing) start
-         * address of the memory node. */
-        struct list_head node_list;
+        /* List of all memory nodes that immediatly preceed a free hole. */
+        struct list_head hole_stack;
+        /* head_node.node_list is the list of all memory nodes, ordered
+         * according to the (increasing) start address of the memory node. */
+        struct drm_mm_node head_node;
         struct list_head unused_nodes;
         int num_unused;
         spinlock_t unused_lock;
@@ -70,8 +72,28 @@ struct drm_mm {
         unsigned scanned_blocks;
         unsigned long scan_start;
         unsigned long scan_end;
+        struct drm_mm_node *prev_scanned_node;
 };
 
+static inline bool drm_mm_node_allocated(struct drm_mm_node *node)
+{
+        return node->allocated;
+}
+
+static inline bool drm_mm_initialized(struct drm_mm *mm)
+{
+        return mm->hole_stack.next;
+}
+#define drm_mm_for_each_node(entry, mm) list_for_each_entry(entry, \
+                                                &(mm)->head_node.node_list, \
+                                                node_list);
+#define drm_mm_for_each_scanned_node_reverse(entry, n, mm) \
+        for (entry = (mm)->prev_scanned_node, \
+                next = entry ? list_entry(entry->node_list.next, \
+                        struct drm_mm_node, node_list) : NULL; \
+             entry != NULL; entry = next, \
+                next = entry ? list_entry(entry->node_list.next, \
+                        struct drm_mm_node, node_list) : NULL) \
 /*
  * Basic range manager support (drm_mm.c)
  */
@@ -118,7 +140,15 @@ static inline struct drm_mm_node *drm_mm_get_block_atomic_range(
         return drm_mm_get_block_range_generic(parent, size, alignment,
                                                 start, end, 1);
 }
+extern int drm_mm_insert_node(struct drm_mm *mm, struct drm_mm_node *node,
+                              unsigned long size, unsigned alignment);
+extern int drm_mm_insert_node_in_range(struct drm_mm *mm,
+                                       struct drm_mm_node *node,
+                                       unsigned long size, unsigned alignment,
+                                       unsigned long start, unsigned long end);
 extern void drm_mm_put_block(struct drm_mm_node *cur);
+extern void drm_mm_remove_node(struct drm_mm_node *node);
+extern void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new);
 extern struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm,
                                               unsigned long size,
                                               unsigned alignment,
@@ -134,11 +164,6 @@ extern int drm_mm_init(struct drm_mm *mm, unsigned long start,
                        unsigned long size);
 extern void drm_mm_takedown(struct drm_mm *mm);
 extern int drm_mm_clean(struct drm_mm *mm);
-extern unsigned long drm_mm_tail_space(struct drm_mm *mm);
-extern int drm_mm_remove_space_from_tail(struct drm_mm *mm,
-                                         unsigned long size);
-extern int drm_mm_add_space_to_tail(struct drm_mm *mm,
-                                    unsigned long size, int atomic);
 extern int drm_mm_pre_get(struct drm_mm *mm);
 
 static inline struct drm_mm *drm_get_mm(struct drm_mm_node *block)