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

Commit 2db86dfc authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm: Check against color expansion in drm_mm_reserve_node() 



Use the color_adjust callback when reserving a node to check if
inserting a node into this hole requires any additional space, and so if
that space then conflicts with an existing allocation.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
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/20161123141118.23876-2-chris@chris-wilson.co.uk
parent 522e85dd

drivers/gpu/drm/drm_mm.c

+8 −3
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node) 
	u64 end = node->start + node->size;

	struct drm_mm_node *hole;

	u64 hole_start, hole_end;

	u64 adj_start, adj_end;



	if (WARN_ON(node->size == 0))

		return -EINVAL;
@@ -327,9 +328,13 @@ int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node) 
	if (!hole->hole_follows)

		return -ENOSPC;



	hole_start = __drm_mm_hole_node_start(hole);

	hole_end = __drm_mm_hole_node_end(hole);

	if (hole_start > node->start || hole_end < end)

	adj_start = hole_start = __drm_mm_hole_node_start(hole);

	adj_end = hole_end = __drm_mm_hole_node_end(hole);



	if (mm->color_adjust)

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



	if (adj_start > node->start || adj_end < end)

		return -ENOSPC;



	node->mm = mm;