nouveau: use alloc_page_vma directly

hmm_vma_alloc_locked_page is scheduled to go away, use the proper
mm function directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
index 40c47d6a7d783d72c869937b2a6ad946086a20cf..a50f6fd2fe24f5f30d79b0981b21b22207dafce6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -148,11 +148,12 @@ nouveau_dmem_fault_alloc_and_copy(struct vm_area_struct *vma,
                if (!spage || !(src_pfns[i] & MIGRATE_PFN_MIGRATE))
                        continue;
 
-               dpage = hmm_vma_alloc_locked_page(vma, addr);
+               dpage = alloc_page_vma(GFP_HIGHUSER, vma, addr);
                if (!dpage) {
                        dst_pfns[i] = MIGRATE_PFN_ERROR;
                        continue;
                }
+               lock_page(dpage);
 
                dst_pfns[i] = migrate_pfn(page_to_pfn(dpage)) |
                              MIGRATE_PFN_LOCKED;