aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_vm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/drm_vm.c')
-rw-r--r--drivers/gpu/drm/drm_vm.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 85a8fa6e09fe..23a824e6a22a 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -62,7 +62,7 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
62 tmp = pgprot_writecombine(tmp); 62 tmp = pgprot_writecombine(tmp);
63 else 63 else
64 tmp = pgprot_noncached(tmp); 64 tmp = pgprot_noncached(tmp);
65#elif defined(__sparc__) || defined(__arm__) 65#elif defined(__sparc__) || defined(__arm__) || defined(__mips__)
66 tmp = pgprot_noncached(tmp); 66 tmp = pgprot_noncached(tmp);
67#endif 67#endif
68 return tmp; 68 return tmp;
@@ -619,20 +619,11 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
619 offset = drm_core_get_reg_ofs(dev); 619 offset = drm_core_get_reg_ofs(dev);
620 vma->vm_flags |= VM_IO; /* not in core dump */ 620 vma->vm_flags |= VM_IO; /* not in core dump */
621 vma->vm_page_prot = drm_io_prot(map->type, vma); 621 vma->vm_page_prot = drm_io_prot(map->type, vma);
622#if !defined(__arm__)
623 if (io_remap_pfn_range(vma, vma->vm_start, 622 if (io_remap_pfn_range(vma, vma->vm_start,
624 (map->offset + offset) >> PAGE_SHIFT, 623 (map->offset + offset) >> PAGE_SHIFT,
625 vma->vm_end - vma->vm_start, 624 vma->vm_end - vma->vm_start,
626 vma->vm_page_prot)) 625 vma->vm_page_prot))
627 return -EAGAIN; 626 return -EAGAIN;
628#else
629 if (remap_pfn_range(vma, vma->vm_start,
630 (map->offset + offset) >> PAGE_SHIFT,
631 vma->vm_end - vma->vm_start,
632 vma->vm_page_prot))
633 return -EAGAIN;
634#endif
635
636 DRM_DEBUG(" Type = %d; start = 0x%lx, end = 0x%lx," 627 DRM_DEBUG(" Type = %d; start = 0x%lx, end = 0x%lx,"
637 " offset = 0x%llx\n", 628 " offset = 0x%llx\n",
638 map->type, 629 map->type,