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

Commit fafecc01 authored by Michel Thierry's avatar Michel Thierry Committed by Daniel Vetter
Browse files

drm/mm: Do DRM_MM_CREATE_TOP adj_start calculation after color_adjust 



The adj_start calculation for DRM_MM_CREATE_TOP should happen after
mm->color_adjust. There was an inconsistency between
drm_mm_insert_helper_range
and drm_mm_insert_helper, as the later was already updating after
color_adjust.

Didn't spot it before, as color_adjust is only done in systems without
LLC. But I'm not aware of anybody using this test case yet.

Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bcfe0c09

drivers/gpu/drm/drm_mm.c

+3 −3
Original line number Diff line number Diff line
@@ -267,12 +267,12 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, 
	if (adj_end > end)

		adj_end = end;



	if (flags & DRM_MM_CREATE_TOP)

		adj_start = adj_end - size;



	if (mm->color_adjust)

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



	if (flags & DRM_MM_CREATE_TOP)

		adj_start = adj_end - size;



	if (alignment) {

		u64 tmp = adj_start;

		unsigned rem;