dma-buf: cleanup dma_buf_export() to make it easily extensible

At present, dma_buf_export() takes a series of parameters, which
makes it difficult to add any new parameters for exporters, if required.

Make it simpler by moving all these parameters into a struct, and pass
the struct * as parameter to dma_buf_export().

While at it, unite dma_buf_export_named() with dma_buf_export(), and
change all callers accordingly.

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>

8 files changed, 62 insertions, 16 deletions

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index ef5feeecec84..580e10acaa3a 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -538,8 +538,14 @@ struct dma_buf *
 armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj,
         int flags)
 {
-        return dma_buf_export(obj, &armada_gem_prime_dmabuf_ops, obj->size,
-                              O_RDWR, NULL);
+        DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+
+        exp_info.ops = &armada_gem_prime_dmabuf_ops;
+        exp_info.size = obj->size;
+        exp_info.flags = O_RDWR;
+        exp_info.priv = obj;
+
+        return dma_buf_export(&exp_info);
 }
 
 struct drm_gem_object *
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 7482b06cd08f..7fec191b45f7 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -339,13 +339,17 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops =  {
 struct dma_buf *drm_gem_prime_export(struct drm_device *dev,
                                      struct drm_gem_object *obj, int flags)
 {
-        struct reservation_object *robj = NULL;
+        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;
 
         if (dev->driver->gem_prime_res_obj)
-                robj = dev->driver->gem_prime_res_obj(obj);
+                exp_info.resv = dev->driver->gem_prime_res_obj(obj);
 
-        return dma_buf_export(obj, &drm_gem_prime_dmabuf_ops, obj->size,
-                              flags, robj);
+        return dma_buf_export(&exp_info);
 }
 EXPORT_SYMBOL(drm_gem_prime_export);
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
index 3833bf8ca025..cd485c091b30 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
@@ -185,9 +185,14 @@ struct dma_buf *exynos_dmabuf_prime_export(struct drm_device *drm_dev,
                                 struct drm_gem_object *obj, int flags)
 {
         struct exynos_drm_gem_obj *exynos_gem_obj = to_exynos_gem_obj(obj);
+        DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
 
-        return dma_buf_export(obj, &exynos_dmabuf_ops,
-                                exynos_gem_obj->base.size, flags, NULL);
+        exp_info.ops = &exynos_dmabuf_ops;
+        exp_info.size = exynos_gem_obj->base.size;
+        exp_info.flags = flags;
+        exp_info.priv = obj;
+
+        return dma_buf_export(&exp_info);
 }
 
 struct drm_gem_object *exynos_dmabuf_prime_import(struct drm_device *drm_dev,
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
index 82a1f4b57778..7998da27c500 100644
--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
@@ -230,6 +230,13 @@ struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
                                       struct drm_gem_object *gem_obj, int flags)
 {
         struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);
+        DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+
+        exp_info.ops = &i915_dmabuf_ops;
+        exp_info.size = gem_obj->size;
+        exp_info.flags = flags;
+        exp_info.priv = gem_obj;
+
 
         if (obj->ops->dmabuf_export) {
                 int ret = obj->ops->dmabuf_export(obj);
@@ -237,8 +244,7 @@ struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
                         return ERR_PTR(ret);
         }
 
-        return dma_buf_export(gem_obj, &i915_dmabuf_ops, gem_obj->size, flags,
-                              NULL);
+        return dma_buf_export(&exp_info);
 }
 
 static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj)
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
index b46dabd9faf7..344fd789170d 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
@@ -171,7 +171,14 @@ static struct dma_buf_ops omap_dmabuf_ops = {
 struct dma_buf *omap_gem_prime_export(struct drm_device *dev,
                 struct drm_gem_object *obj, int flags)
 {
-        return dma_buf_export(obj, &omap_dmabuf_ops, obj->size, flags, NULL);
+        DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+
+        exp_info.ops = &omap_dmabuf_ops;
+        exp_info.size = obj->size;
+        exp_info.flags = flags;
+        exp_info.priv = obj;
+
+        return dma_buf_export(&exp_info);
 }
 
 struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index cfb481943b6b..1217272a51f2 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -627,8 +627,14 @@ struct dma_buf *tegra_gem_prime_export(struct drm_device *drm,
                                        struct drm_gem_object *gem,
                                        int flags)
 {
-        return dma_buf_export(gem, &tegra_gem_prime_dmabuf_ops, gem->size,
-                              flags, NULL);
+        DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+
+        exp_info.ops = &tegra_gem_prime_dmabuf_ops;
+        exp_info.size = gem->size;
+        exp_info.flags = flags;
+        exp_info.priv = gem;
+
+        return dma_buf_export(&exp_info);
 }
 
 struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm,
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c
index 12c87110db3a..4f5fa8d65fe9 100644
--- a/drivers/gpu/drm/ttm/ttm_object.c
+++ b/drivers/gpu/drm/ttm/ttm_object.c
@@ -683,6 +683,12 @@ int ttm_prime_handle_to_fd(struct ttm_object_file *tfile,
 
         dma_buf = prime->dma_buf;
         if (!dma_buf || !get_dma_buf_unless_doomed(dma_buf)) {
+                DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+
+                exp_info.ops = &tdev->ops;
+                exp_info.size = prime->size;
+                exp_info.flags = flags;
+                exp_info.priv = prime;
 
                 /*
                  * Need to create a new dma_buf, with memory accounting.
@@ -694,8 +700,7 @@ int ttm_prime_handle_to_fd(struct ttm_object_file *tfile,
                         goto out_unref;
                 }
 
-                dma_buf = dma_buf_export(prime, &tdev->ops,
-                                         prime->size, flags, NULL);
+                dma_buf = dma_buf_export(&exp_info);
                 if (IS_ERR(dma_buf)) {
                         ret = PTR_ERR(dma_buf);
                         ttm_mem_global_free(tdev->mem_glob,
diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
index ac8a66b4dfc2..e2243edd1ce3 100644
--- a/drivers/gpu/drm/udl/udl_dmabuf.c
+++ b/drivers/gpu/drm/udl/udl_dmabuf.c
@@ -202,7 +202,14 @@ static struct dma_buf_ops udl_dmabuf_ops = {
 struct dma_buf *udl_gem_prime_export(struct drm_device *dev,
                                      struct drm_gem_object *obj, int flags)
 {
-        return dma_buf_export(obj, &udl_dmabuf_ops, obj->size, flags, NULL);
+        DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+
+        exp_info.ops = &udl_dmabuf_ops;
+        exp_info.size = obj->size;
+        exp_info.flags = flags;
+        exp_info.priv = obj;
+
+        return dma_buf_export(&exp_info);
 }
 
 static int udl_prime_create(struct drm_device *dev,