drm/i915: export error state ref handling

[deliverable/linux.git] / drivers / gpu / drm / drm_vm.c

diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 43e7825d37172f2e04da4565b085826f2041b5ab..feb20035b2c44d08ac217c0b48d40967f70f6463 100644 (file)
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -49,13 +49,10 @@ static pgprot_t drm_io_prot(struct drm_local_map *map,
        pgprot_t tmp = vm_get_page_prot(vma->vm_flags);
 
 #if defined(__i386__) || defined(__x86_64__)
-       if (map->type != _DRM_AGP) {
-               if (map->type == _DRM_FRAME_BUFFER ||
-                   map->flags & _DRM_WRITE_COMBINING)
-                       tmp = pgprot_writecombine(tmp);
-               else
-                       tmp = pgprot_noncached(tmp);
-       }
+       if (map->type == _DRM_REGISTERS && !(map->flags & _DRM_WRITE_COMBINING))
+               tmp = pgprot_noncached(tmp);
+       else
+               tmp = pgprot_writecombine(tmp);
 #elif defined(__powerpc__)
        pgprot_val(tmp) |= _PAGE_NO_CACHE;
        if (map->type == _DRM_REGISTERS)
@@ -616,7 +613,6 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
        case _DRM_FRAME_BUFFER:
        case _DRM_REGISTERS:
                offset = drm_core_get_reg_ofs(dev);
-               vma->vm_flags |= VM_IO; /* not in core dump */
                vma->vm_page_prot = drm_io_prot(map, vma);
                if (io_remap_pfn_range(vma, vma->vm_start,
                                       (map->offset + offset) >> PAGE_SHIFT,