| From ac1e516d5a4c56bf0cb4a3dfc0672f689131cfd4 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> |
| Date: Tue, 2 Apr 2019 09:29:35 +0200 |
| Subject: drm/ttm: fix start page for huge page check in ttm_put_pages() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Christian König <christian.koenig@amd.com> |
| |
| commit ac1e516d5a4c56bf0cb4a3dfc0672f689131cfd4 upstream. |
| |
| The first page entry is always the same with itself. |
| |
| Signed-off-by: Christian König <christian.koenig@amd.com> |
| Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> |
| Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> |
| Reviewed-by: Huang Rui <ray.huang@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Cc: Zubin Mithra <zsm@chromium.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| 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 |
| @@ -732,7 +732,7 @@ static void ttm_put_pages(struct page ** |
| #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
| if (!(flags & TTM_PAGE_FLAG_DMA32) && |
| (npages - i) >= HPAGE_PMD_NR) { |
| - for (j = 0; j < HPAGE_PMD_NR; ++j) |
| + for (j = 1; j < HPAGE_PMD_NR; ++j) |
| if (p++ != pages[i + j]) |
| break; |
| |
| @@ -767,7 +767,7 @@ static void ttm_put_pages(struct page ** |
| if (!p) |
| break; |
| |
| - for (j = 0; j < HPAGE_PMD_NR; ++j) |
| + for (j = 1; j < HPAGE_PMD_NR; ++j) |
| if (p++ != pages[i + j]) |
| break; |
| |
