Merge drm-upstream/drm-next into drm-misc-next

We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index d7661702c11c..4f80100ff5f3 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -422,14 +422,13 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
         return 0;
 }
 
-static int tegra_bo_fault(struct vm_fault *vmf)
+static vm_fault_t tegra_bo_fault(struct vm_fault *vmf)
 {
         struct vm_area_struct *vma = vmf->vma;
         struct drm_gem_object *gem = vma->vm_private_data;
         struct tegra_bo *bo = to_tegra_bo(gem);
         struct page *page;
         pgoff_t offset;
-        int err;
 
         if (!bo->pages)
                 return VM_FAULT_SIGBUS;
@@ -437,20 +436,7 @@ static int tegra_bo_fault(struct vm_fault *vmf)
         offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
         page = bo->pages[offset];
 
-        err = vm_insert_page(vma, vmf->address, page);
-        switch (err) {
-        case -EAGAIN:
-        case 0:
-        case -ERESTARTSYS:
-        case -EINTR:
-        case -EBUSY:
-                return VM_FAULT_NOPAGE;
-
-        case -ENOMEM:
-                return VM_FAULT_OOM;
-        }
-
-        return VM_FAULT_SIGBUS;
+        return vmf_insert_page(vma, vmf->address, page);
 }
 
 const struct vm_operations_struct tegra_bo_vm_ops = {
@@ -649,6 +635,8 @@ struct dma_buf *tegra_gem_prime_export(struct drm_device *drm,
 {
         DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
 
+        exp_info.exp_name = KBUILD_MODNAME;
+        exp_info.owner = drm->driver->fops->owner;
         exp_info.ops = &tegra_gem_prime_dmabuf_ops;
         exp_info.size = gem->size;
         exp_info.flags = flags;