Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0b7af18 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: mm: add api for embedding struct drm_mm_node 



The old api has a two-step process: First search for a suitable
free hole, then allocate from that specific hole. No user used
this to do anything clever. So drop it for the embeddable variant
of the drm_mm api (the old one retains this ability, for the time
being).

With struct drm_mm_node embedded, we cannot track allocations
anymore by checking for a NULL pointer. So keep track of this
and add a small helper drm_mm_node_allocated.

Also add a function to move allocations between different struct
drm_mm_node.

v2: Implement suggestions by Chris Wilson.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 9fc935de

drivers/gpu/drm/drm_mm.c

+84 −9
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ static void drm_mm_insert_helper(struct drm_mm_node *hole_node, 
	unsigned long hole_start = drm_mm_hole_node_start(hole_node);

	unsigned long hole_end = drm_mm_hole_node_end(hole_node);



	BUG_ON(!hole_node->hole_follows || node->allocated);



	if (alignment)

		tmp = hole_start % alignment;
@@ -136,6 +138,7 @@ static void drm_mm_insert_helper(struct drm_mm_node *hole_node, 
	node->start = hole_start + wasted;

	node->size = size;

	node->mm = mm;

	node->allocated = 1;



	INIT_LIST_HEAD(&node->hole_stack);

	list_add(&node->node_list, &hole_node->node_list);
@@ -157,8 +160,6 @@ struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *hole_node, 
{

	struct drm_mm_node *node;



	BUG_ON(!hole_node->hole_follows);



	node = drm_mm_kmalloc(hole_node->mm, atomic);

	if (unlikely(node == NULL))

		return NULL;
@@ -169,6 +170,26 @@ struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *hole_node, 
}

EXPORT_SYMBOL(drm_mm_get_block_generic);



/**

 * Search for free space and insert a preallocated memory node. Returns

 * -ENOSPC if no suitable free area is available. The preallocated memory node

 * must be cleared.

 */

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);

	if (!hole_node)

		return -ENOSPC;



	drm_mm_insert_helper(hole_node, node, size, alignment);



	return 0;

}

EXPORT_SYMBOL(drm_mm_insert_node);



static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,

				       struct drm_mm_node *node,

				       unsigned long size, unsigned alignment,
@@ -179,6 +200,8 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, 
	unsigned long hole_start = drm_mm_hole_node_start(hole_node);

	unsigned long hole_end = drm_mm_hole_node_end(hole_node);



	BUG_ON(!hole_node->hole_follows || node->allocated);



	if (hole_start < start)

		wasted += start - hole_start;

	if (alignment)
@@ -195,6 +218,7 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, 
	node->start = hole_start + wasted;

	node->size = size;

	node->mm = mm;

	node->allocated = 1;



	INIT_LIST_HEAD(&node->hole_stack);

	list_add(&node->node_list, &hole_node->node_list);
@@ -219,8 +243,6 @@ struct drm_mm_node *drm_mm_get_block_range_generic(struct drm_mm_node *hole_node 
{

	struct drm_mm_node *node;



	BUG_ON(!hole_node->hole_follows);



	node = drm_mm_kmalloc(hole_node->mm, atomic);

	if (unlikely(node == NULL))

		return NULL;
@@ -232,14 +254,34 @@ struct drm_mm_node *drm_mm_get_block_range_generic(struct drm_mm_node *hole_node 
}

EXPORT_SYMBOL(drm_mm_get_block_range_generic);



/*

 * Put a block. Merge with the previous and / or next block if they are free.

 * Otherwise add to the free stack.

/**

 * 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.

 */



void drm_mm_put_block(struct drm_mm_node *node)

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)

{

	struct drm_mm_node *hole_node;



	hole_node = drm_mm_search_free_in_range(mm, size, alignment,

						start, end, 0);

	if (!hole_node)

		return -ENOSPC;



	drm_mm_insert_helper_range(hole_node, node, size, alignment,

				   start, end);



	return 0;

}

EXPORT_SYMBOL(drm_mm_insert_node_in_range);



/**

 * Remove a memory node from the allocator.

 */

void drm_mm_remove_node(struct drm_mm_node *node)

{

	struct drm_mm *mm = node->mm;

	struct drm_mm_node *prev_node;
@@ -264,6 +306,22 @@ void drm_mm_put_block(struct drm_mm_node *node) 
		list_move(&prev_node->hole_stack, &mm->hole_stack);



	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);
@@ -367,6 +425,23 @@ struct drm_mm_node *drm_mm_search_free_in_range(const struct drm_mm *mm, 
}

EXPORT_SYMBOL(drm_mm_search_free_in_range);



/**

 * Moves an allocation. To be used with embedded struct drm_mm_node.

 */

void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new)

{

	list_replace(&old->node_list, &new->node_list);

	list_replace(&old->node_list, &new->hole_stack);

	new->hole_follows = old->hole_follows;

	new->mm = old->mm;

	new->start = old->start;

	new->size = old->size;



	old->allocated = 0;

	new->allocated = 1;

}

EXPORT_SYMBOL(drm_mm_replace_node);



/**

 * Initializa lru scanning.

 *

include/drm/drm_mm.h

+14 −5
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct drm_mm_node { 
	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;
@@ -73,6 +74,11 @@ struct drm_mm { 
	unsigned long scan_end;

};



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;
@@ -126,7 +132,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,
@@ -142,11 +156,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)