UPSTREAM: drm/edid: Extract SADs properly from multiple audio data blocks

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_prime.c

diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 9f935f55d74c32561300f9a59517c19fb6293e0d..3331c5647d186f1851b31dd87cc3ed3d6eec0dfd 100644 (file)
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -71,6 +71,11 @@ struct drm_prime_attachment {
        enum dma_data_direction dir;
 };
 
+struct drm_prime_callback_data {
+       struct drm_gem_object *obj;
+       struct sg_table *sgt;
+};
+
 static int drm_prime_add_buf_handle(struct drm_prime_file_private *prime_fpriv,
                                    struct dma_buf *dma_buf, uint32_t handle)
 {
@@ -333,20 +338,23 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops =  {
  * drm_gem_prime_export - helper library implementation of the export callback
  * @dev: drm_device to export from
  * @obj: GEM object to export
- * @flags: flags like DRM_CLOEXEC
+ * @flags: flags like DRM_CLOEXEC and DRM_RDWR
  *
  * This is the implementation of the gem_prime_export functions for GEM drivers
  * using the PRIME helpers.
  */
 struct dma_buf *drm_gem_prime_export(struct drm_device *dev,
-                                    struct drm_gem_object *obj, int flags)
+                                    struct drm_gem_object *obj,
+                                    int flags)
 {
-       DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
-
-       exp_info.ops = &drm_gem_prime_dmabuf_ops;
-       exp_info.size = obj->size;
-       exp_info.flags = flags;
-       exp_info.priv = obj;
+       struct dma_buf_export_info exp_info = {
+               .exp_name = KBUILD_MODNAME, /* white lie for debug */
+               .owner = dev->driver->fops->owner,
+               .ops = &drm_gem_prime_dmabuf_ops,
+               .size = obj->size,
+               .flags = flags,
+               .priv = obj,
+       };
 
        if (dev->driver->gem_prime_res_obj)
                exp_info.resv = dev->driver->gem_prime_res_obj(obj);
@@ -488,6 +496,23 @@ out_unlock:
 }
 EXPORT_SYMBOL(drm_gem_prime_handle_to_fd);
 
+static void drm_gem_prime_dmabuf_release_callback(void *data)
+{
+       struct drm_prime_callback_data *cb_data = data;
+
+       if (cb_data && cb_data->obj && cb_data->obj->import_attach) {
+               struct dma_buf_attachment *attach = cb_data->obj->import_attach;
+               struct sg_table *sgt = cb_data->sgt;
+
+               if (sgt)
+                       dma_buf_unmap_attachment(attach, sgt,
+                                                DMA_BIDIRECTIONAL);
+               dma_buf_detach(attach->dmabuf, attach);
+               drm_gem_object_unreference_unlocked(cb_data->obj);
+               kfree(cb_data);
+       }
+}
+
 /**
  * drm_gem_prime_import - helper library implementation of the import callback
  * @dev: drm_device to import into
@@ -502,6 +527,7 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
        struct dma_buf_attachment *attach;
        struct sg_table *sgt;
        struct drm_gem_object *obj;
+       struct drm_prime_callback_data *cb_data;
        int ret;
 
        if (dma_buf->ops == &drm_gem_prime_dmabuf_ops) {
@@ -516,6 +542,13 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
                }
        }
 
+       cb_data = dma_buf_get_release_callback_data(dma_buf,
+                                       drm_gem_prime_dmabuf_release_callback);
+       if (cb_data && cb_data->obj && cb_data->obj->dev == dev) {
+               drm_gem_object_reference(cb_data->obj);
+               return cb_data->obj;
+       }
+
        if (!dev->driver->gem_prime_import_sg_table)
                return ERR_PTR(-EINVAL);
 
@@ -524,11 +557,16 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
                return ERR_CAST(attach);
 
        get_dma_buf(dma_buf);
+       cb_data = kmalloc(sizeof(*cb_data), GFP_KERNEL);
+       if (!cb_data) {
+               ret = -ENOMEM;
+               goto fail_detach;
+       }
 
        sgt = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL);
        if (IS_ERR(sgt)) {
                ret = PTR_ERR(sgt);
-               goto fail_detach;
+               goto fail_free;
        }
 
        obj = dev->driver->gem_prime_import_sg_table(dev, attach, sgt);
@@ -536,13 +574,20 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
                ret = PTR_ERR(obj);
                goto fail_unmap;
        }
-
        obj->import_attach = attach;
+       cb_data->obj = obj;
+       cb_data->sgt = sgt;
+       dma_buf_set_release_callback(dma_buf,
+                       drm_gem_prime_dmabuf_release_callback, cb_data);
+       dma_buf_put(dma_buf);
+       drm_gem_object_reference(obj);
 
        return obj;
 
 fail_unmap:
        dma_buf_unmap_attachment(attach, sgt, DMA_BIDIRECTIONAL);
+fail_free:
+       kfree(cb_data);
 fail_detach:
        dma_buf_detach(dma_buf, attach);
        dma_buf_put(dma_buf);
@@ -632,7 +677,6 @@ int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,
                                 struct drm_file *file_priv)
 {
        struct drm_prime_handle *args = data;
-       uint32_t flags;
 
        if (!drm_core_check_feature(dev, DRIVER_PRIME))
                return -EINVAL;
@@ -641,14 +685,11 @@ int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,
                return -ENOSYS;
 
        /* check flags are valid */
-       if (args->flags & ~DRM_CLOEXEC)
+       if (args->flags & ~(DRM_CLOEXEC | DRM_RDWR))
                return -EINVAL;
 
-       /* we only want to pass DRM_CLOEXEC which is == O_CLOEXEC */
-       flags = args->flags & DRM_CLOEXEC;
-
        return dev->driver->prime_handle_to_fd(dev, file_priv,
-                       args->handle, flags, &args->fd);
+                       args->handle, args->flags, &args->fd);
 }
 
 int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data,