diff options
| author | Christian König <christian.koenig@amd.com> | 2019-04-10 05:43:43 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-04-11 11:01:51 -0400 |
| commit | 453393369dc9806d2455151e329c599684762428 (patch) | |
| tree | d58d288fd1783843e44813e1bc3510d41f16b3e0 /drivers/gpu/drm/ttm/ttm_page_alloc.c | |
| parent | ac1e516d5a4c56bf0cb4a3dfc0672f689131cfd4 (diff) | |
drm/ttm: fix incrementing the page pointer for huge pages
When we increment the counter we need to increment the pointer as well.
Signed-off-by: Christian König <christian.koenig@amd.com>
Fixes: e16858a7e6e7 drm/ttm: fix start page for huge page check in ttm_put_pages()
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_page_alloc.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index c74147f0cbe3..627f8dc91d0e 100644 --- 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 **pages, unsigned npages, int flags, | |||
| 733 | if (!(flags & TTM_PAGE_FLAG_DMA32) && | 733 | if (!(flags & TTM_PAGE_FLAG_DMA32) && |
| 734 | (npages - i) >= HPAGE_PMD_NR) { | 734 | (npages - i) >= HPAGE_PMD_NR) { |
| 735 | for (j = 1; j < HPAGE_PMD_NR; ++j) | 735 | for (j = 1; j < HPAGE_PMD_NR; ++j) |
| 736 | if (p++ != pages[i + j]) | 736 | if (++p != pages[i + j]) |
| 737 | break; | 737 | break; |
| 738 | 738 | ||
| 739 | if (j == HPAGE_PMD_NR) | 739 | if (j == HPAGE_PMD_NR) |
| @@ -768,7 +768,7 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags, | |||
| 768 | break; | 768 | break; |
| 769 | 769 | ||
| 770 | for (j = 1; j < HPAGE_PMD_NR; ++j) | 770 | for (j = 1; j < HPAGE_PMD_NR; ++j) |
| 771 | if (p++ != pages[i + j]) | 771 | if (++p != pages[i + j]) |
| 772 | break; | 772 | break; |
| 773 | 773 | ||
| 774 | if (j != HPAGE_PMD_NR) | 774 | if (j != HPAGE_PMD_NR) |
