|
@@ -220,7 +220,11 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
|
|
pfn = page_to_pfn(page);
|
|
|
}
|
|
|
|
|
|
- ret = vm_insert_mixed(&cvma, address, pfn);
|
|
|
+ if (vma->vm_flags & VM_MIXEDMAP)
|
|
|
+ ret = vm_insert_mixed(&cvma, address, pfn);
|
|
|
+ else
|
|
|
+ ret = vm_insert_pfn(&cvma, address, pfn);
|
|
|
+
|
|
|
/*
|
|
|
* Somebody beat us to this PTE or prefaulting to
|
|
|
* an already populated PTE, or prefaulting error.
|
|
@@ -319,7 +323,14 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
|
|
|
*/
|
|
|
|
|
|
vma->vm_private_data = bo;
|
|
|
- vma->vm_flags |= VM_IO | VM_MIXEDMAP | VM_DONTEXPAND | VM_DONTDUMP;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * PFNMAP is faster than MIXEDMAP due to reduced page
|
|
|
+ * administration. So use MIXEDMAP only if private VMA, where
|
|
|
+ * we need to support COW.
|
|
|
+ */
|
|
|
+ vma->vm_flags |= (vma->vm_flags & VM_SHARED) ? VM_PFNMAP : VM_MIXEDMAP;
|
|
|
+ vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
|
|
|
return 0;
|
|
|
out_unref:
|
|
|
ttm_bo_unref(&bo);
|
|
@@ -334,7 +345,8 @@ int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo)
|
|
|
|
|
|
vma->vm_ops = &ttm_bo_vm_ops;
|
|
|
vma->vm_private_data = ttm_bo_reference(bo);
|
|
|
- vma->vm_flags |= VM_IO | VM_MIXEDMAP | VM_DONTEXPAND;
|
|
|
+ vma->vm_flags |= (vma->vm_flags & VM_SHARED) ? VM_PFNMAP : VM_MIXEDMAP;
|
|
|
+ vma->vm_flags |= VM_IO | VM_DONTEXPAND;
|
|
|
return 0;
|
|
|
}
|
|
|
EXPORT_SYMBOL(ttm_fbdev_mmap);
|