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

Commit 18b40c58 authored by Geliang Tang's avatar Geliang Tang Committed by Daniel Vetter
Browse files

drm/mm: rewrite drm_mm_for_each_hole 



When backwards is 0, __drm_mm_for_each_hole is same as
drm_mm_for_each_hole. So I rewrite drm_mm_for_each_hole
by using __drm_mm_for_each_hole.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a48a62bc

include/drm/drm_mm.h

+9 −14
Original line number Diff line number Diff line
@@ -180,6 +180,14 @@ static inline u64 drm_mm_hole_node_end(struct drm_mm_node *hole_node) 
						&(mm)->head_node.node_list, \

						node_list)



#define __drm_mm_for_each_hole(entry, mm, hole_start, hole_end, backwards) \

	for (entry = list_entry((backwards) ? (mm)->hole_stack.prev : (mm)->hole_stack.next, struct drm_mm_node, hole_stack); \

	     &entry->hole_stack != &(mm)->hole_stack ? \

	     hole_start = drm_mm_hole_node_start(entry), \

	     hole_end = drm_mm_hole_node_end(entry), \

	     1 : 0; \

	     entry = list_entry((backwards) ? entry->hole_stack.prev : entry->hole_stack.next, struct drm_mm_node, hole_stack))



/**

 * drm_mm_for_each_hole - iterator to walk over all holes

 * @entry: drm_mm_node used internally to track progress
@@ -200,20 +208,7 @@ static inline u64 drm_mm_hole_node_end(struct drm_mm_node *hole_node) 
 * going backwards.

 */

#define drm_mm_for_each_hole(entry, mm, hole_start, hole_end) \

	for (entry = list_entry((mm)->hole_stack.next, struct drm_mm_node, hole_stack); \

	     &entry->hole_stack != &(mm)->hole_stack ? \

	     hole_start = drm_mm_hole_node_start(entry), \

	     hole_end = drm_mm_hole_node_end(entry), \

	     1 : 0; \

	     entry = list_entry(entry->hole_stack.next, struct drm_mm_node, hole_stack))



#define __drm_mm_for_each_hole(entry, mm, hole_start, hole_end, backwards) \

	for (entry = list_entry((backwards) ? (mm)->hole_stack.prev : (mm)->hole_stack.next, struct drm_mm_node, hole_stack); \

	     &entry->hole_stack != &(mm)->hole_stack ? \

	     hole_start = drm_mm_hole_node_start(entry), \

	     hole_end = drm_mm_hole_node_end(entry), \

	     1 : 0; \

	     entry = list_entry((backwards) ? entry->hole_stack.prev : entry->hole_stack.next, struct drm_mm_node, hole_stack))

	__drm_mm_for_each_hole(entry, mm, hole_start, hole_end, 0)



/*

 * Basic range manager support (drm_mm.c)