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

Commit 5ff7ec02 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: swap consecutive allocated cached pages v3 



When we detect consecutive allocation of pages swap them to avoid
accidentally freeing them as huge page.

v2: use swap
v3: check if it's really the first allocated page

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarRoger He <Hongbo.He@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2bf257d6

drivers/gpu/drm/ttm/ttm_page_alloc.c

+6 −1
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags, 
#endif

	struct list_head plist;

	struct page *p = NULL;

	unsigned count;

	unsigned count, first;

	int r;



	/* No pool for cached pages */
@@ -918,6 +918,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags, 
		}

#endif



		first = i;

		while (npages) {

			p = alloc_page(gfp_flags);

			if (!p) {
@@ -925,6 +926,10 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags, 
				return -ENOMEM;

			}



			/* Swap the pages if we detect consecutive order */

			if (i > first && pages[i - 1] == p - 1)

				swap(p, pages[i - 1]);



			pages[i++] = p;

			--npages;

		}