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

+ *
  * Authors:
  * Thomas Hellström
  */
-#include "drmP.h"
+#include
-#include "drm_mm.h"
+#include
 #include
+#include
 #include
 #define MM_UNUSED_TARGET 4
 	return next_node->start;
+}
 static void drm_mm_insert_helper(struct drm_mm_node *hole_node,
 				 struct drm_mm_node *node,
+				 unsigned long size, unsigned alignment,
-				 unsigned long size, unsigned alignment)
+				 unsigned long color)
+{
-	struct drm_mm *mm = hole_node->mm;
-	unsigned long tmp = 0, wasted = 0;
+	struct drm_mm *mm = hole_node->mm;
 	unsigned long hole_start = drm_mm_hole_node_start(hole_node);
+	unsigned long hole_end = drm_mm_hole_node_end(hole_node);
+	unsigned long adj_start = hole_start;
-	unsigned long hole_end = drm_mm_hole_node_end(hole_node);
+	unsigned long adj_end = hole_end;
+	BUG_ON(!hole_node->hole_follows || node->allocated);
+	if (mm->color_adjust)
-	BUG_ON(!hole_node->hole_follows || node->allocated);
+		mm->color_adjust(hole_node, color, &adj_start, &adj_end);
+	if (alignment) {
+		unsigned tmp = adj_start % alignment;
+		if (tmp)
-	if (alignment)
+			adj_start += alignment - tmp;
-		tmp = hole_start % alignment;
+	}
-	if (!tmp) {
-		hole_node->hole_follows = 0;
+	if (adj_start == hole_start) {
-		list_del_init(&hole_node->hole_stack);
+		hole_node->hole_follows = 0;
-	} else
+		list_del(&hole_node->hole_stack);
+	}
 		wasted = alignment - tmp;
 	node->start = adj_start;
-	node->start = hole_start + wasted;
+	node->size = size;
-	node->size = size;
+	node->mm = mm;
+	node->color = color;
-	node->mm = mm;
+	node->allocated = 1;
 	node->allocated = 1;
 	INIT_LIST_HEAD(&node->hole_stack);
-	INIT_LIST_HEAD(&node->hole_stack);
-	list_add(&node->node_list, &hole_node->node_list);
 	list_add(&node->node_list, &hole_node->node_list);
 	BUG_ON(node->start + node->size > hole_end);
 	BUG_ON(node->start + node->size > adj_end);
 	if (node->start + node->size < hole_end) {
-		list_add(&node->hole_stack, &mm->hole_stack);
+	node->hole_follows = 0;
+	if (node->start + node->size < hole_end) {
-		node->hole_follows = 1;
+		list_add(&node->hole_stack, &mm->hole_stack);
-	} else {
+		node->hole_follows = 1;
 		node->hole_follows = 0;
+}
 struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *hole_node,
-struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *hole_node,
+						 unsigned long size,
-						 unsigned long size,
+					     unsigned alignment,
-					     unsigned alignment,
+					     unsigned long color,
 						 int atomic)
 int drm_mm_insert_node(struct drm_mm *mm, struct drm_mm_node *node,
 		       unsigned long size, unsigned alignment)
+{
 	struct drm_mm_node *hole_node;
-	hole_node = drm_mm_search_free(mm, size, alignment, 0);
+	hole_node = drm_mm_search_free(mm, size, alignment, false);
 	if (!hole_node)
 		return -ENOSPC;
-	drm_mm_insert_helper(hole_node, node, size, alignment);
+	drm_mm_insert_helper(hole_node, node, size, alignment, 0);
 	return 0;
+}
 EXPORT_SYMBOL(drm_mm_insert_node);
 static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
-static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
+				       struct drm_mm_node *node,
-				       struct drm_mm_node *node,
+				       unsigned long size, unsigned alignment,
-				       unsigned long size, unsigned alignment,
-				       unsigned long start, unsigned long end)
+				       unsigned long color,
 				       unsigned long start, unsigned long end)
+{
+	struct drm_mm *mm = hole_node->mm;
-	struct drm_mm *mm = hole_node->mm;
+	unsigned long hole_start = drm_mm_hole_node_start(hole_node);
-	unsigned long tmp = 0, wasted = 0;
+	unsigned long hole_end = drm_mm_hole_node_end(hole_node);
-	unsigned long hole_start = drm_mm_hole_node_start(hole_node);
-	unsigned long hole_end = drm_mm_hole_node_end(hole_node);
+	unsigned long adj_start = hole_start;
+	unsigned long adj_end = hole_end;
+	BUG_ON(!hole_node->hole_follows || node->allocated);
+	if (mm->color_adjust)
-	BUG_ON(!hole_node->hole_follows || node->allocated);
+		mm->color_adjust(hole_node, color, &adj_start, &adj_end);
+	if (adj_start < start)
-	if (hole_start < start)
+		adj_start = start;
 		wasted += start - hole_start;
-	if (alignment)
+	if (alignment) {
-		tmp = (hole_start + wasted) % alignment;
+		unsigned tmp = adj_start % alignment;
+	if (tmp)
-	if (tmp)
+			adj_start += alignment - tmp;
 		wasted += alignment - tmp;
 	if (adj_start == hole_start) {
-	if (!wasted) {
+		hole_node->hole_follows = 0;
-		hole_node->hole_follows = 0;
+		list_del(&hole_node->hole_stack);
-		list_del_init(&hole_node->hole_stack);
+	}
+	node->start = adj_start;
 	node->size = size;
-	node->start = hole_start + wasted;
+	node->mm = mm;
-	node->size = size;
+	node->color = color;
-	node->mm = mm;
-	node->allocated = 1;
 	node->allocated = 1;
 	INIT_LIST_HEAD(&node->hole_stack);
-	list_add(&node->node_list, &hole_node->node_list);
+	INIT_LIST_HEAD(&node->hole_stack);
 	list_add(&node->node_list, &hole_node->node_list);
 	BUG_ON(node->start + node->size > hole_end);
+	BUG_ON(node->start + node->size > adj_end);
 	BUG_ON(node->start + node->size > end);
-	if (node->start + node->size < hole_end) {
+	node->hole_follows = 0;
-		list_add(&node->hole_stack, &mm->hole_stack);
+	if (node->start + node->size < hole_end) {
-		node->hole_follows = 1;
+		list_add(&node->hole_stack, &mm->hole_stack);
-	} else {
+		node->hole_follows = 1;
 		node->hole_follows = 0;
+}
-}
 struct drm_mm_node *drm_mm_get_block_range_generic(struct drm_mm_node *hole_node,
-struct drm_mm_node *drm_mm_get_block_range_generic(struct drm_mm_node *hole_node,
+						unsigned long size,
-						unsigned long size,
+						unsigned alignment,
-						unsigned alignment,
+						unsigned long color,
 				unsigned long start, unsigned long end)
+{
 	struct drm_mm_node *hole_node;
 	hole_node = drm_mm_search_free_in_range(mm, size, alignment,
-						start, end, 0);
+						start, end, false);
 	if (!hole_node)
 		return -ENOSPC;
-	drm_mm_insert_helper_range(hole_node, node, size, alignment,
+	drm_mm_insert_helper_range(hole_node, node, size, alignment, 0,
 				   start, end);
 EXPORT_SYMBOL(drm_mm_put_block);
 static int check_free_hole(unsigned long start, unsigned long end,
 			   unsigned long size, unsigned alignment)
-{
-	unsigned wasted = 0;
+{
 	if (end - start < size)
 		return 0;
 	if (alignment) {
 		unsigned tmp = start % alignment;
 		if (tmp)
-			wasted = alignment - tmp;
+			start += alignment - tmp;
-	}
-	if (end >= start + size + wasted) {
-		return 1;
+	}
-	return 0;
+	return end >= start + size;
 }
+struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
 				       unsigned long size,
-struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm,
+					       unsigned alignment,
-				       unsigned long size,
+					       unsigned long color,
-				       unsigned alignment, int best_match)
+					       bool best_match)
 	best = NULL;
 	best_size = ~0UL;
+	list_for_each_entry(entry, &mm->hole_stack, hole_stack) {
+		unsigned long adj_start = drm_mm_hole_node_start(entry);
+		unsigned long adj_end = drm_mm_hole_node_end(entry);
+		if (mm->color_adjust) {
+			mm->color_adjust(entry, color, &adj_start, &adj_end);
+			if (adj_end <= adj_start)
+				continue;
+		}
-	list_for_each_entry(entry, &mm->hole_stack, hole_stack) {
-		BUG_ON(!entry->hole_follows);
-		if (!check_free_hole(drm_mm_hole_node_start(entry),
-				     drm_mm_hole_node_end(entry),
+		BUG_ON(!entry->hole_follows);
-				     size, alignment))
+		if (!check_free_hole(adj_start, adj_end, size, alignment))
 			continue;
+			}
+		}
 	return best;
 }
-EXPORT_SYMBOL(drm_mm_search_free);
+EXPORT_SYMBOL(drm_mm_search_free_generic);
-struct drm_mm_node *drm_mm_search_free_in_range(const struct drm_mm *mm,
+struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm,
+						unsigned long size,
-						unsigned long size,
+						unsigned alignment,
-						unsigned alignment,
+							unsigned long color,
 						unsigned long start,
 						unsigned long end,
-						int best_match)
+							bool best_match)
+{
 	struct drm_mm_node *entry;
 			start : drm_mm_hole_node_start(entry);
 		unsigned long adj_end = drm_mm_hole_node_end(entry) > end ?
 			end : drm_mm_hole_node_end(entry);
+		BUG_ON(!entry->hole_follows);
+		if (mm->color_adjust) {
+			mm->color_adjust(entry, color, &adj_start, &adj_end);
+			if (adj_end <= adj_start)
+				continue;
+		}
 		BUG_ON(!entry->hole_follows);
 		if (!check_free_hole(adj_start, adj_end, size, alignment))
 			continue;
+			}
+		}
 	return best;
 }
-EXPORT_SYMBOL(drm_mm_search_free_in_range);
+EXPORT_SYMBOL(drm_mm_search_free_in_range_generic);
 /**
  * Moves an allocation. To be used with embedded struct drm_mm_node.
 	list_replace(&old->hole_stack, &new->hole_stack);
 	new->hole_follows = old->hole_follows;
 	new->mm = old->mm;
 	new->start = old->start;
 	new->size = old->size;
+	new->color = old->color;
 	old->allocated = 0;
 	new->allocated = 1;
+}
  * hole.
+ *
  * Warning: As long as the scan list is non-empty, no other operations than
  * adding/removing nodes to/from the scan list are allowed.
  */
-void drm_mm_init_scan(struct drm_mm *mm, unsigned long size,
+void drm_mm_init_scan(struct drm_mm *mm,
+		      unsigned long size,
-		      unsigned alignment)
+		      unsigned alignment,
+		      unsigned long color)
+{
+	mm->scan_color = color;
 	mm->scan_alignment = alignment;
 	mm->scan_size = size;
 	mm->scanned_blocks = 0;
 	mm->scan_hit_start = 0;
 	mm->scan_hit_size = 0;
  * hole. This version is for range-restricted scans.
+ *
  * Warning: As long as the scan list is non-empty, no other operations than
  * adding/removing nodes to/from the scan list are allowed.
  */
-void drm_mm_init_scan_with_range(struct drm_mm *mm, unsigned long size,
+void drm_mm_init_scan_with_range(struct drm_mm *mm,
+				 unsigned long size,
 				 unsigned alignment,
+				 unsigned long color,
 				 unsigned long start,
 				 unsigned long end)
+{
+	mm->scan_color = color;
 	mm->scan_alignment = alignment;
 	mm->scan_size = size;
 	mm->scanned_blocks = 0;
 	mm->scan_hit_start = 0;
 	mm->scan_hit_size = 0;
 	node->node_list.next = &mm->prev_scanned_node->node_list;
 	mm->prev_scanned_node = node;
 	hole_start = drm_mm_hole_node_start(prev_node);
-	hole_end = drm_mm_hole_node_end(prev_node);
-	if (mm->scan_check_range) {
-		adj_start = hole_start < mm->scan_start ?
-			mm->scan_start : hole_start;
-		adj_end = hole_end > mm->scan_end ?
-			mm->scan_end : hole_end;
+	hole_end = drm_mm_hole_node_end(prev_node);
 	} else {
 		adj_start = hole_start;
+		adj_end = hole_end;
+	if (mm->color_adjust)
+		mm->color_adjust(prev_node, mm->scan_color, &adj_start, &adj_end);
+	if (mm->scan_check_range) {
+		if (adj_start < mm->scan_start)
+			adj_start = mm->scan_start;
+		if (adj_end > mm->scan_end)
-		adj_end = hole_end;
+			adj_end = mm->scan_end;
+	}
-	if (check_free_hole(adj_start , adj_end,
+	if (check_free_hole(adj_start, adj_end,
 	mm->head_node.mm = mm;
 	mm->head_node.start = start + size;
 	mm->head_node.size = start - mm->head_node.start;
 	list_add_tail(&mm->head_node.hole_stack, &mm->hole_stack);
+	mm->color_adjust = NULL;
 	return 0;
+}
 EXPORT_SYMBOL(drm_mm_init);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_mm.c – Rev 1963 → 3031