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

Commit 3db93756 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm: Apply range restriction after color adjustment when allocation 



mm->color_adjust() compares the hole with its neighbouring nodes. They
only abutt before we restrict the hole, so we have to apply color_adjust
before we apply the range restriction.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161222083641.2691-36-chris@chris-wilson.co.uk
parent 3f85fb34

drivers/gpu/drm/drm_mm.c

+6 −10
Original line number Diff line number Diff line
@@ -410,14 +410,12 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, 


	DRM_MM_BUG_ON(!drm_mm_hole_follows(hole_node) || node->allocated);



	if (adj_start < start)

		adj_start = start;

	if (adj_end > end)

		adj_end = end;



	if (mm->color_adjust)

		mm->color_adjust(hole_node, color, &adj_start, &adj_end);



	adj_start = max(adj_start, start);

	adj_end = min(adj_end, end);



	if (flags & DRM_MM_CREATE_TOP)

		adj_start = adj_end - size;
@@ -625,17 +623,15 @@ static struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_ 
			       flags & DRM_MM_SEARCH_BELOW) {

		u64 hole_size = adj_end - adj_start;



		if (adj_start < start)

			adj_start = start;

		if (adj_end > end)

			adj_end = end;



		if (mm->color_adjust) {

			mm->color_adjust(entry, color, &adj_start, &adj_end);

			if (adj_end <= adj_start)

				continue;

		}



		adj_start = max(adj_start, start);

		adj_end = min(adj_end, end);



		if (!check_free_hole(adj_start, adj_end, size, alignment))

			continue;