leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: Apply "Memory fragmentation from lost alignment blocks"

Browse Source 
also for the atomic path by using a common code-path.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Thomas Hellstrom 2009-06-17 12:29:56 +02:00 committed by Dave Airlie
parent 78ecf091aa
commit 89579f7782
2 changed files with 22 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/gpu/drm/drm_mm.c
View File

@ -187,9 +187,10 @@ static struct drm_mm_node *drm_mm_split_at_start(struct drm_mm_node *parent,
} }
struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *node,
struct drm_mm_node *drm_mm_get_block(struct drm_mm_node *node, unsigned long size,
unsigned long size, unsigned alignment) unsigned alignment,
int atomic)
{ {
struct drm_mm_node *align_splitoff = NULL; struct drm_mm_node *align_splitoff = NULL;
@ -200,7 +201,7 @@ struct drm_mm_node *drm_mm_get_block(struct drm_mm_node *node,
if (tmp) { if (tmp) {
align_splitoff = align_splitoff =
drm_mm_split_at_start(node, alignment - tmp, 0); drm_mm_split_at_start(node, alignment - tmp, atomic);
if (unlikely(align_splitoff == NULL)) if (unlikely(align_splitoff == NULL))
return NULL; return NULL;
} }
@ -209,7 +210,7 @@ struct drm_mm_node *drm_mm_get_block(struct drm_mm_node *node,
list_del_init(&node->fl_entry); list_del_init(&node->fl_entry);
node->free = 0; node->free = 0;
} else { } else {
node = drm_mm_split_at_start(node, size, 0); node = drm_mm_split_at_start(node, size, atomic);
} }
if (align_splitoff) if (align_splitoff)
@ -217,42 +218,7 @@ struct drm_mm_node *drm_mm_get_block(struct drm_mm_node *node,
return node; return node;
} }
EXPORT_SYMBOL(drm_mm_get_block_generic);
EXPORT_SYMBOL(drm_mm_get_block);
struct drm_mm_node *drm_mm_get_block_atomic(struct drm_mm_node *parent,
unsigned long size,
unsigned alignment)
{
struct drm_mm_node *align_splitoff = NULL;
struct drm_mm_node *child;
unsigned tmp = 0;
if (alignment)
tmp = parent->start % alignment;
if (tmp) {
align_splitoff =
drm_mm_split_at_start(parent, alignment - tmp, 1);
if (unlikely(align_splitoff == NULL))
return NULL;
}
if (parent->size == size) {
list_del_init(&parent->fl_entry);
parent->free = 0;
return parent;
} else {
child = drm_mm_split_at_start(parent, size, 1);
}
if (align_splitoff)
drm_mm_put_block(align_splitoff);
return child;
}
EXPORT_SYMBOL(drm_mm_get_block_atomic);
/* /*
* Put a block. Merge with the previous and / or next block if they are free. * Put a block. Merge with the previous and / or next block if they are free.

21
include/drm/drm_mm.h
View File

@ -59,13 +59,22 @@ struct drm_mm {
/* /*
* Basic range manager support (drm_mm.c) * Basic range manager support (drm_mm.c)
*/ */
extern struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *node,
extern struct drm_mm_node *drm_mm_get_block(struct drm_mm_node *parent, unsigned long size,
unsigned long size, unsigned alignment,
unsigned alignment); int atomic);
extern struct drm_mm_node *drm_mm_get_block_atomic(struct drm_mm_node *parent, static inline struct drm_mm_node *drm_mm_get_block(struct drm_mm_node *parent,
unsigned long size, unsigned long size,
unsigned alignment); unsigned alignment)
{
return drm_mm_get_block_generic(parent, size, alignment, 0);
}
static inline struct drm_mm_node *drm_mm_get_block_atomic(struct drm_mm_node *parent,
unsigned long size,
unsigned alignment)
{
return drm_mm_get_block_generic(parent, size, alignment, 1);
}
extern void drm_mm_put_block(struct drm_mm_node *cur); extern void drm_mm_put_block(struct drm_mm_node *cur);
extern struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm, extern struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm,
unsigned long size, unsigned long size,