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

Commit 8c2cdfb2 authored by Christian König's avatar Christian König Committed by Greg Kroah-Hartman
Browse files

drm/ttm: fix incrementing the page pointer for huge pages 



commit 453393369dc9806d2455151e329c599684762428 upstream.

When we increment the counter we need to increment the pointer as well.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Fixes: e16858a7e6e7 drm/ttm: fix start page for huge page check in ttm_put_pages()
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Acked-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: Zubin Mithra <zsm@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83a88fb9

drivers/gpu/drm/ttm/ttm_page_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags, 
			if (!(flags & TTM_PAGE_FLAG_DMA32) &&

			    (npages - i) >= HPAGE_PMD_NR) {

				for (j = 1; j < HPAGE_PMD_NR; ++j)

					if (p++ != pages[i + j])

					if (++p != pages[i + j])

					    break;



				if (j == HPAGE_PMD_NR)
@@ -768,7 +768,7 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags, 
				break;



			for (j = 1; j < HPAGE_PMD_NR; ++j)

				if (p++ != pages[i + j])

				if (++p != pages[i + j])

				    break;



			if (j != HPAGE_PMD_NR)