Merge tag 'drm-misc-next-2018-11-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for v4.21:

Core Changes:
- Merge drm_info.c into drm_debugfs.c
- Complete the fake drm_crtc_commit's hw_done/flip_done sooner.
- Remove deprecated drm_obj_ref/unref functions. All drivers use get/put now.
- Decrease stack use of drm_gem_prime_mmap.
- Improve documentation for dumb callbacks.

Driver Changes:
- Add edid support to virtio.
- Wait on implicit fence in meson and sun4i.
- Add support for BGRX8888 to sun4i.
- Preparation patches for sun4i driver to start supporting linear and tiled YUV formats.
- Add support for HDMI 1.4 4k modes to meson, and support for VIC alternate timings.
- Drop custom dumb_map in vkms.
- Small fixes and cleanups to v3d.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/151a3270-b1be-ed75-bd58-6b29d741f592@linux.intel.com

1 files changed, 20 insertions, 11 deletions

diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 5737cb8c6f03..231e3f6d5f41 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -663,24 +663,33 @@ EXPORT_SYMBOL(drm_gem_prime_handle_to_fd);
  */
 int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
 {
-        /* Used by drm_gem_mmap() to lookup the GEM object */
-        struct drm_file priv = {
-                .minor = obj->dev->primary,
-        };
-        struct file fil = {
-                .private_data = &priv,
-        };
+        struct drm_file *priv;
+        struct file *fil;
         int ret;
 
-        ret = drm_vma_node_allow(&obj->vma_node, &priv);
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        fil = kzalloc(sizeof(*fil), GFP_KERNEL);
+        if (!priv || !fil) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        /* Used by drm_gem_mmap() to lookup the GEM object */
+        priv->minor = obj->dev->primary;
+        fil->private_data = priv;
+
+        ret = drm_vma_node_allow(&obj->vma_node, priv);
         if (ret)
-                return ret;
+                goto out;
 
         vma->vm_pgoff += drm_vma_node_start(&obj->vma_node);
 
-        ret = obj->dev->driver->fops->mmap(&fil, vma);
+        ret = obj->dev->driver->fops->mmap(fil, vma);
 
-        drm_vma_node_revoke(&obj->vma_node, &priv);
+        drm_vma_node_revoke(&obj->vma_node, priv);
+out:
+        kfree(priv);
+        kfree(fil);
 
         return ret;
 }