]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drm/ttm: fix start page for huge page check in ttm_put_pages()
authorChristian König <christian.koenig@amd.com>
Tue, 2 Apr 2019 07:29:35 +0000 (09:29 +0200)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 14 Feb 2020 05:29:37 +0000 (00:29 -0500)
BugLink: https://bugs.launchpad.net/bugs/1861934
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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/gpu/drm/ttm/ttm_page_alloc.c

index e6e64c02404f9ef75822576fce90ce02841e831c..e5251807f76d9aba17b22b0940da0a3d3c43b111 100644 (file)
@@ -779,7 +779,7 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
 #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;
 
@@ -814,7 +814,7 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
                        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;