[PATCH 4.19 33/84] drm/ttm: fix incrementing the page pointer for huge pages

From: Greg Kroah-Hartman
Date: Thu Jan 16 2020 - 18:29:49 EST


From: Christian KÃnig <christian.koenig@xxxxxxx>

commit 453393369dc9806d2455151e329c599684762428 upstream.

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

Signed-off-by: Christian KÃnig <christian.koenig@xxxxxxx>
Fixes: e16858a7e6e7 drm/ttm: fix start page for huge page check in ttm_put_pages()
Reviewed-by: Michel DÃnzer <michel.daenzer@xxxxxxx>
Acked-by: Huang Rui <ray.huang@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: Zubin Mithra <zsm@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -733,7 +733,7 @@ static void ttm_put_pages(struct page **
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 **
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)