|
@@ -692,7 +692,7 @@ drm_gem_object_release(struct drm_gem_object *obj)
|
|
|
WARN_ON(obj->dma_buf);
|
|
WARN_ON(obj->dma_buf);
|
|
|
|
|
|
|
|
if (obj->filp)
|
|
if (obj->filp)
|
|
|
- fput(obj->filp);
|
|
|
|
|
|
|
+ fput(obj->filp);
|
|
|
}
|
|
}
|
|
|
EXPORT_SYMBOL(drm_gem_object_release);
|
|
EXPORT_SYMBOL(drm_gem_object_release);
|
|
|
|
|
|
|
@@ -782,7 +782,7 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
|
|
|
vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
|
|
vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
|
|
|
vma->vm_ops = dev->driver->gem_vm_ops;
|
|
vma->vm_ops = dev->driver->gem_vm_ops;
|
|
|
vma->vm_private_data = obj;
|
|
vma->vm_private_data = obj;
|
|
|
- vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
|
|
|
|
|
|
|
+ vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
|
|
|
|
|
|
|
|
/* Take a ref for this mapping of the object, so that the fault
|
|
/* Take a ref for this mapping of the object, so that the fault
|
|
|
* handler can dereference the mmap offset's pointer to the object.
|
|
* handler can dereference the mmap offset's pointer to the object.
|