Merge tag 'drm-next-2020-04-08' of git://anongit.freedesktop.org/drm/drm

[tomoyo/tomoyo-test1.git] / drivers / gpu / drm / nouveau / nouveau_svm.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c
index 8dfa5cb..645fedd 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
@@ -373,7 +373,6 @@ static const u64
 nouveau_svm_pfn_flags[HMM_PFN_FLAG_MAX] = {
        [HMM_PFN_VALID         ] = NVIF_VMM_PFNMAP_V0_V,
        [HMM_PFN_WRITE         ] = NVIF_VMM_PFNMAP_V0_W,
-       [HMM_PFN_DEVICE_PRIVATE] = NVIF_VMM_PFNMAP_V0_VRAM,
 };
 
 static const u64
@@ -547,7 +546,7 @@ static int nouveau_range_fault(struct nouveau_svmm *svmm,
                range.default_flags = 0;
                range.pfn_flags_mask = -1UL;
                down_read(&mm->mmap_sem);
-               ret = hmm_range_fault(&range, 0);
+               ret = hmm_range_fault(&range);
                up_read(&mm->mmap_sem);
                if (ret <= 0) {
                        if (ret == 0 || ret == -EBUSY)