WebSVN – Kolibri OS – Diff – /drivers/video/drm/drm_mm.c

 #include
 #include
 #define MM_UNUSED_TARGET 4
-static struct drm_mm_node *drm_mm_kmalloc(struct drm_mm *mm, int atomic)
-{
-	struct drm_mm_node *child;
-	if (atomic)
-		child = kzalloc(sizeof(*child), GFP_ATOMIC);
-	else
-		child = kzalloc(sizeof(*child), GFP_KERNEL);
+static struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
-	if (unlikely(child == NULL)) {
-       spin_lock(&mm->unused_lock);
+						unsigned long size,
-		if (list_empty(&mm->unused_nodes))
-			child = NULL;
-		else {
-			child =
+						unsigned alignment,
-			    list_entry(mm->unused_nodes.next,
-				       struct drm_mm_node, node_list);
-			list_del(&child->node_list);
-			--mm->num_unused;
-		}
-       spin_unlock(&mm->unused_lock);
-	}
-	return child;
-}
-/* drm_mm_pre_get() - pre allocate drm_mm_node structure
- * drm_mm:	memory manager struct we are pre-allocating for
- *
- * Returns 0 on success or -ENOMEM if allocation fails.
+						unsigned long color,
- */
-int drm_mm_pre_get(struct drm_mm *mm)
+						enum drm_mm_search_flags flags);
-{
-	struct drm_mm_node *node;
-	spin_lock(&mm->unused_lock);
-	while (mm->num_unused < MM_UNUSED_TARGET) {
-		spin_unlock(&mm->unused_lock);
-		node = kzalloc(sizeof(*node), GFP_KERNEL);
-		spin_lock(&mm->unused_lock);
+static struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm,
-		if (unlikely(node == NULL)) {
+						unsigned long size,
-			int ret = (mm->num_unused < 2) ? -ENOMEM : 0;
+						unsigned alignment,
-			spin_unlock(&mm->unused_lock);
-			return ret;
+						unsigned long color,
-		}
-		++mm->num_unused;
-		list_add_tail(&node->node_list, &mm->unused_nodes);
-	}
-	spin_unlock(&mm->unused_lock);
-	return 0;
+						unsigned long start,
 						unsigned long end,
-EXPORT_SYMBOL(drm_mm_pre_get);
+						enum drm_mm_search_flags flags);
 static void drm_mm_insert_helper(struct drm_mm_node *hole_node,
 		list_add(&node->hole_stack, &mm->hole_stack);
 		node->hole_follows = 1;
+	}
+}
-struct drm_mm_node *drm_mm_create_block(struct drm_mm *mm,
-					unsigned long start,
-					unsigned long size,
-					bool atomic)
+int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node)
 {
-	struct drm_mm_node *hole, *node;
+	struct drm_mm_node *hole;
-	unsigned long end = start + size;
+	unsigned long end = node->start + node->size;
 	unsigned long hole_start;
+	unsigned long hole_end;
+	BUG_ON(node == NULL);
 	unsigned long hole_end;
+	/* Find the relevant hole to add our node to */
 	drm_mm_for_each_hole(hole, mm, hole_start, hole_end) {
-		if (hole_start > start || hole_end < end)
-			continue;
-		node = drm_mm_kmalloc(mm, atomic);
-		if (unlikely(node == NULL))
-			return NULL;
 		if (hole_start > node->start || hole_end < end)
-		node->start = start;
+			continue;
 		node->size = size;
 		node->mm = mm;
 		node->allocated = 1;
 		INIT_LIST_HEAD(&node->hole_stack);
 		list_add(&node->node_list, &hole->node_list);
-		if (start == hole_start) {
+		if (node->start == hole_start) {
 			hole->hole_follows = 0;
 			list_del_init(&hole->hole_stack);
+		}
-		node->hole_follows = 0;
-		if (end != hole_end) {
-			list_add(&node->hole_stack, &mm->hole_stack);
-			node->hole_follows = 1;
 		node->hole_follows = 0;
-		return node;
-	}
-	WARN(1, "no hole found for block 0x%lx + 0x%lx\n", start, size);
-	return NULL;
-}
-EXPORT_SYMBOL(drm_mm_create_block);
-struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *hole_node,
-						 unsigned long size,
-					     unsigned alignment,
-					     unsigned long color,
-						 int atomic)
+		if (end != hole_end) {
-{
+			list_add(&node->hole_stack, &mm->hole_stack);
-	struct drm_mm_node *node;
+			node->hole_follows = 1;
+		}
-	node = drm_mm_kmalloc(hole_node->mm, atomic);
-	if (unlikely(node == NULL))
+		return 0;
 		return NULL;
-	drm_mm_insert_helper(hole_node, node, size, alignment, color);
+	WARN(1, "no hole found for node 0x%lx + 0x%lx\n",
 	     node->start, node->size);
-	return node;
+	return -ENOSPC;
+}
-EXPORT_SYMBOL(drm_mm_get_block_generic);
+EXPORT_SYMBOL(drm_mm_reserve_node);
 /**
-/**
+ * Search for free space and insert a preallocated memory node. Returns
- * Search for free space and insert a preallocated memory node. Returns
+ * -ENOSPC if no suitable free area is available. The preallocated memory node
- * -ENOSPC if no suitable free area is available. The preallocated memory node
+ * must be cleared.
- * must be cleared.
+ */
- */
+int drm_mm_insert_node_generic(struct drm_mm *mm, struct drm_mm_node *node,
-int drm_mm_insert_node_generic(struct drm_mm *mm, struct drm_mm_node *node,
+			       unsigned long size, unsigned alignment,
-			       unsigned long size, unsigned alignment,
+			       unsigned long color,
-			       unsigned long color)
+			       enum drm_mm_search_flags flags)
+{
-	struct drm_mm_node *hole_node;
-	hole_node = drm_mm_search_free_generic(mm, size, alignment,
-					       color, 0);
-	if (!hole_node)
-		return -ENOSPC;
-	drm_mm_insert_helper(hole_node, node, size, alignment, color);
+	struct drm_mm_node *hole_node;
 	return 0;
 	hole_node = drm_mm_search_free_generic(mm, size, alignment,
-EXPORT_SYMBOL(drm_mm_insert_node_generic);
+					       color, flags);
 	if (!hole_node)
 		list_add(&node->hole_stack, &mm->hole_stack);
 		node->hole_follows = 1;
+	}
+}
-struct drm_mm_node *drm_mm_get_block_range_generic(struct drm_mm_node *hole_node,
-						unsigned long size,
-						unsigned alignment,
-						unsigned long color,
-						unsigned long start,
-						unsigned long end,
-						int atomic)
-{
-	struct drm_mm_node *node;
-	node = drm_mm_kmalloc(hole_node->mm, atomic);
-	if (unlikely(node == NULL))
-			return NULL;
-	drm_mm_insert_helper_range(hole_node, node, size, alignment, color,
-				   start, end);
-	return node;
-}
-EXPORT_SYMBOL(drm_mm_get_block_range_generic);
 /**
  * Search for free space and insert a preallocated memory node. Returns
  * -ENOSPC if no suitable free area is available. This is for range
  * restricted allocations. The preallocated memory node must be cleared.
  */
 int drm_mm_insert_node_in_range_generic(struct drm_mm *mm, struct drm_mm_node *node,
 					unsigned long size, unsigned alignment, unsigned long color,
+					unsigned long start, unsigned long end,
-				unsigned long start, unsigned long end)
+					enum drm_mm_search_flags flags)
+{
 	struct drm_mm_node *hole_node;
 	hole_node = drm_mm_search_free_in_range_generic(mm,
 							size, alignment, color,
-							start, end, 0);
+							start, end, flags);
 	if (!hole_node)
 		return -ENOSPC;
 	drm_mm_insert_helper_range(hole_node, node,
 				   size, alignment, color,
 				   start, end);
-	return 0;
-}
-EXPORT_SYMBOL(drm_mm_insert_node_in_range_generic);
-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)
-{
-	return drm_mm_insert_node_in_range_generic(mm, node, size, alignment, 0, start, end);
+	return 0;
+}
-EXPORT_SYMBOL(drm_mm_insert_node_in_range);
+EXPORT_SYMBOL(drm_mm_insert_node_in_range_generic);
 /**
  * Remove a memory node from the allocator.
  */
+void drm_mm_remove_node(struct drm_mm_node *node)
+{
+	struct drm_mm *mm = node->mm;
-void drm_mm_remove_node(struct drm_mm_node *node)
+	struct drm_mm_node *prev_node;
-	struct drm_mm *mm = node->mm;
+	if (WARN_ON(!node->allocated))
-	struct drm_mm_node *prev_node;
+		return;
 	list_del(&node->node_list);
 	node->allocated = 0;
+}
 EXPORT_SYMBOL(drm_mm_remove_node);
-/*
- * Remove a memory node from the allocator and free the allocated struct
- * drm_mm_node. Only to be used on a struct drm_mm_node obtained by one of the
- * drm_mm_get_block functions.
- */
-void drm_mm_put_block(struct drm_mm_node *node)
-{
-	struct drm_mm *mm = node->mm;
-    drm_mm_remove_node(node);
-    spin_lock(&mm->unused_lock);
-    if (mm->num_unused < MM_UNUSED_TARGET) {
-    list_add(&node->node_list, &mm->unused_nodes);
-        ++mm->num_unused;
-    } else
-    kfree(node);
-    spin_unlock(&mm->unused_lock);
-}
-EXPORT_SYMBOL(drm_mm_put_block);
 static int check_free_hole(unsigned long start, unsigned long end,
 			   unsigned long size, unsigned alignment)
+{
 	if (end - start < size)
+	}
 	return end >= start + size;
 }
-struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
+static struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
 				       unsigned long size,
 					       unsigned alignment,
 					       unsigned long color,
-					       bool best_match)
+						      enum drm_mm_search_flags flags)
+{
 	struct drm_mm_node *entry;
 	struct drm_mm_node *best;
+		}
 		if (!check_free_hole(adj_start, adj_end, size, alignment))
 			continue;
-			if (!best_match)
+		if (!(flags & DRM_MM_SEARCH_BEST))
 				return entry;
 			if (entry->size < best_size) {
 				best = entry;
 				best_size = entry->size;
+			}
-		}
+		}
 	return best;
 	return best;
 EXPORT_SYMBOL(drm_mm_search_free_generic);
-struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm,
+static struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm,
 						unsigned long size,
 						unsigned alignment,
 							unsigned long color,
 						unsigned long start,
 						unsigned long end,
-							bool best_match)
+							enum drm_mm_search_flags flags)
+		}
 		if (!check_free_hole(adj_start, adj_end, size, alignment))
 			continue;
-			if (!best_match)
+		if (!(flags & DRM_MM_SEARCH_BEST))
 				return entry;
 			if (entry->size < best_size) {
 				best = entry;
 				best_size = entry->size;
+			}
-		}
+		}
 	return best;
 	return best;
 EXPORT_SYMBOL(drm_mm_search_free_in_range_generic);
  * Nodes _must_ be removed in the exact same order from the scan list as they
  * have been added, otherwise the internal state of the memory manager will be
  * corrupted.
+ *
  * When the scan list is empty, the selected memory nodes can be freed. An
- * immediately following drm_mm_search_free with best_match = 0 will then return
+ * immediately following drm_mm_search_free with !DRM_MM_SEARCH_BEST will then
- * the just freed block (because its at the top of the free_stack list).
+ * return the just freed block (because its at the top of the free_stack list).
+ *
  * Returns one if this block should be evicted, zero otherwise. Will always
  * return zero when no hole has been found.
  */
 int drm_mm_scan_remove_block(struct drm_mm_node *node)
 EXPORT_SYMBOL(drm_mm_clean);
 void drm_mm_init(struct drm_mm * mm, unsigned long start, unsigned long size)
+{
-	INIT_LIST_HEAD(&mm->hole_stack);
-	INIT_LIST_HEAD(&mm->unused_nodes);
-	mm->num_unused = 0;
+	INIT_LIST_HEAD(&mm->hole_stack);
-	mm->scanned_blocks = 0;
-	spin_lock_init(&mm->unused_lock);
+	mm->scanned_blocks = 0;
 	/* Clever trick to avoid a special case in the free hole tracking. */
 	INIT_LIST_HEAD(&mm->head_node.node_list);
+}
 EXPORT_SYMBOL(drm_mm_init);
 void drm_mm_takedown(struct drm_mm * mm)
-{
-	struct drm_mm_node *entry, *next;
+{
-	if (WARN(!list_empty(&mm->head_node.node_list),
+	WARN(!list_empty(&mm->head_node.node_list),
-		 "Memory manager not clean. Delaying takedown\n")) {
-		return;
-	}
-	spin_lock(&mm->unused_lock);
-	list_for_each_entry_safe(entry, next, &mm->unused_nodes, node_list) {
-	list_del(&entry->node_list);
-	kfree(entry);
-		--mm->num_unused;
-	}
-	spin_unlock(&mm->unused_lock);
-	BUG_ON(mm->num_unused != 0);
+	     "Memory manager not clean during takedown.\n");
+}
 EXPORT_SYMBOL(drm_mm_takedown);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_mm.c – Rev 4075 → 4104