diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-01-15 19:56:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-15 20:56:32 -0500 |
commit | 01c8f1c44b83a0825b573e7c723b033cece37b86 (patch) | |
tree | 5900d53e74db4515aa6aa760dd120122171fdaa0 /drivers/gpu/drm/ttm | |
parent | 69660fd797c3e52f7f20478a27687f293d1a41be (diff) |
mm, dax, gpu: convert vm_insert_mixed to pfn_t
Convert the raw unsigned long 'pfn' argument to pfn_t for the purpose of
evaluating the PFN_MAP and PFN_DEV flags. When both are set it triggers
_PAGE_DEVMAP to be set in the resulting pte.
There are no functional changes to the gpu drivers as a result of this
conversion.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/gpu/drm/ttm')
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 8fb7213277cc..06d26dc438b2 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <ttm/ttm_placement.h> | 35 | #include <ttm/ttm_placement.h> |
36 | #include <drm/drm_vma_manager.h> | 36 | #include <drm/drm_vma_manager.h> |
37 | #include <linux/mm.h> | 37 | #include <linux/mm.h> |
38 | #include <linux/pfn_t.h> | ||
38 | #include <linux/rbtree.h> | 39 | #include <linux/rbtree.h> |
39 | #include <linux/module.h> | 40 | #include <linux/module.h> |
40 | #include <linux/uaccess.h> | 41 | #include <linux/uaccess.h> |
@@ -229,7 +230,8 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
229 | } | 230 | } |
230 | 231 | ||
231 | if (vma->vm_flags & VM_MIXEDMAP) | 232 | if (vma->vm_flags & VM_MIXEDMAP) |
232 | ret = vm_insert_mixed(&cvma, address, pfn); | 233 | ret = vm_insert_mixed(&cvma, address, |
234 | __pfn_to_pfn_t(pfn, PFN_DEV)); | ||
233 | else | 235 | else |
234 | ret = vm_insert_pfn(&cvma, address, pfn); | 236 | ret = vm_insert_pfn(&cvma, address, pfn); |
235 | 237 | ||