Merge branch 'master' into crestline

Conflicts:

	shared-core/i915_drm.h

Whitespace change only

1 files changed, 26 insertions, 31 deletions

diff --git a/linux-core/drm_mm.c b/linux-core/drm_mm.c
index a5566b2f..5889ee4d 100644
--- a/linux-core/drm_mm.c
+++ b/linux-core/drm_mm.c
@@ -49,7 +49,7 @@ unsigned long drm_mm_tail_space(drm_mm_t *mm)
 	struct list_head *tail_node;
 	drm_mm_node_t *entry;
 
-	tail_node = mm->root_node.ml_entry.prev;
+	tail_node = mm->ml_entry.prev;
 	entry = list_entry(tail_node, drm_mm_node_t, ml_entry);
 	if (!entry->free)
 		return 0;
@@ -62,7 +62,7 @@ int drm_mm_remove_space_from_tail(drm_mm_t *mm, unsigned long size)
 	struct list_head *tail_node;
 	drm_mm_node_t *entry;
 
-	tail_node = mm->root_node.ml_entry.prev;
+	tail_node = mm->ml_entry.prev;
 	entry = list_entry(tail_node, drm_mm_node_t, ml_entry);
 	if (!entry->free)
 		return -ENOMEM;
@@ -82,8 +82,7 @@ static int drm_mm_create_tail_node(drm_mm_t *mm,
 	drm_mm_node_t *child;
 	
 	child = (drm_mm_node_t *)
-		drm_ctl_cache_alloc(drm_cache.mm, sizeof(*child),
-				    GFP_KERNEL);
+		drm_ctl_alloc(sizeof(*child), DRM_MEM_MM);
 	if (!child)
 		return -ENOMEM;
 
@@ -92,8 +91,8 @@ static int drm_mm_create_tail_node(drm_mm_t *mm,
 	child->start = start;
 	child->mm = mm;
 
-	list_add_tail(&child->ml_entry, &mm->root_node.ml_entry);
-	list_add_tail(&child->fl_entry, &mm->root_node.fl_entry);
+	list_add_tail(&child->ml_entry, &mm->ml_entry);
+	list_add_tail(&child->fl_entry, &mm->fl_entry);
 
 	return 0;
 }
@@ -104,7 +103,7 @@ int drm_mm_add_space_to_tail(drm_mm_t *mm, unsigned long size)
 	struct list_head *tail_node;
 	drm_mm_node_t *entry;
 
-	tail_node = mm->root_node.ml_entry.prev;
+	tail_node = mm->ml_entry.prev;
 	entry = list_entry(tail_node, drm_mm_node_t, ml_entry);
 	if (!entry->free) {
 		return drm_mm_create_tail_node(mm, entry->start + entry->size, size);
@@ -119,8 +118,7 @@ static drm_mm_node_t *drm_mm_split_at_start(drm_mm_node_t *parent,
 	drm_mm_node_t *child;
 	
 	child = (drm_mm_node_t *)
-		drm_ctl_cache_alloc(drm_cache.mm, sizeof(*child),
-				    GFP_KERNEL);
+		drm_ctl_alloc(sizeof(*child), DRM_MEM_MM);
 	if (!child)
 		return NULL;
 
@@ -150,7 +148,7 @@ drm_mm_node_t *drm_mm_get_block(drm_mm_node_t * parent,
 	unsigned tmp = 0;
 
 	if (alignment)
-		tmp = size % alignment;
+		tmp = parent->start % alignment;
 	
 	if (tmp) {
 		align_splitoff = drm_mm_split_at_start(parent, alignment - tmp);
@@ -164,12 +162,8 @@ drm_mm_node_t *drm_mm_get_block(drm_mm_node_t * parent,
 		return parent;
 	} else {
 		child = drm_mm_split_at_start(parent, size);
-		if (!child) {
-			if (align_splitoff) 
-				drm_mm_put_block(align_splitoff);
-			return NULL;
-		}
 	}
+
 	if (align_splitoff)
 		drm_mm_put_block(align_splitoff);
 
@@ -185,9 +179,8 @@ void drm_mm_put_block(drm_mm_node_t * cur)
 {
 
 	drm_mm_t *mm = cur->mm;
-	drm_mm_node_t *list_root = &mm->root_node;
 	struct list_head *cur_head = &cur->ml_entry;
-	struct list_head *root_head = &list_root->ml_entry;
+	struct list_head *root_head = &mm->ml_entry;
 	drm_mm_node_t *prev_node = NULL;
 	drm_mm_node_t *next_node;
 
@@ -207,9 +200,8 @@ void drm_mm_put_block(drm_mm_node_t * cur)
 				prev_node->size += next_node->size;
 				list_del(&next_node->ml_entry);
 				list_del(&next_node->fl_entry);
-				drm_ctl_cache_free(drm_cache.mm,
-						   sizeof(*next_node),
-						   next_node);
+				drm_ctl_free(next_node, sizeof(*next_node),
+					     DRM_MEM_MM);
 			} else {
 				next_node->size += cur->size;
 				next_node->start = cur->start;
@@ -219,10 +211,10 @@ void drm_mm_put_block(drm_mm_node_t * cur)
 	}
 	if (!merged) {
 		cur->free = 1;
-		list_add(&cur->fl_entry, &list_root->fl_entry);
+		list_add(&cur->fl_entry, &mm->fl_entry);
 	} else {
 		list_del(&cur->ml_entry);
-		drm_ctl_cache_free(drm_cache.mm, sizeof(*cur), cur);
+		drm_ctl_free(cur, sizeof(*cur), DRM_MEM_MM);
 	}
 }
 
@@ -231,7 +223,7 @@ drm_mm_node_t *drm_mm_search_free(const drm_mm_t * mm,
 				  unsigned alignment, int best_match)
 {
 	struct list_head *list;
-	const struct list_head *free_stack = &mm->root_node.fl_entry;
+	const struct list_head *free_stack = &mm->fl_entry;
 	drm_mm_node_t *entry;
 	drm_mm_node_t *best;
 	unsigned long best_size;
@@ -244,8 +236,11 @@ drm_mm_node_t *drm_mm_search_free(const drm_mm_t * mm,
 		entry = list_entry(list, drm_mm_node_t, fl_entry);
 		wasted = 0;
 
+		if (entry->size < size) 
+			continue;
+
 		if (alignment) {
-			register unsigned tmp = size % alignment;
+			register unsigned tmp = entry->start % alignment;
 			if (tmp) 
 				wasted += alignment - tmp;
 		}
@@ -266,15 +261,15 @@ drm_mm_node_t *drm_mm_search_free(const drm_mm_t * mm,
 
 int drm_mm_clean(drm_mm_t * mm)
 {
-	struct list_head *head = &mm->root_node.ml_entry;
+	struct list_head *head = &mm->ml_entry;
 
 	return (head->next->next == head);
 }
 
 int drm_mm_init(drm_mm_t * mm, unsigned long start, unsigned long size)
 {
-	INIT_LIST_HEAD(&mm->root_node.ml_entry);
-	INIT_LIST_HEAD(&mm->root_node.fl_entry);
+	INIT_LIST_HEAD(&mm->ml_entry);
+	INIT_LIST_HEAD(&mm->fl_entry);
 
 	return drm_mm_create_tail_node(mm, start, size);
 }
@@ -283,20 +278,20 @@ EXPORT_SYMBOL(drm_mm_init);
 
 void drm_mm_takedown(drm_mm_t * mm)
 {
-	struct list_head *bnode = mm->root_node.fl_entry.next;
+	struct list_head *bnode = mm->fl_entry.next;
 	drm_mm_node_t *entry;
 
 	entry = list_entry(bnode, drm_mm_node_t, fl_entry);
 
-	if (entry->ml_entry.next != &mm->root_node.ml_entry ||
-	    entry->fl_entry.next != &mm->root_node.fl_entry) {
+	if (entry->ml_entry.next != &mm->ml_entry ||
+	    entry->fl_entry.next != &mm->fl_entry) {
 		DRM_ERROR("Memory manager not clean. Delaying takedown\n");
 		return;
 	}
 
 	list_del(&entry->fl_entry);
 	list_del(&entry->ml_entry);
-	drm_ctl_cache_free(drm_cache.mm, sizeof(*entry), entry);
+	drm_ctl_free(entry, sizeof(*entry), DRM_MEM_MM);
 }
 
 EXPORT_SYMBOL(drm_mm_takedown);