drm/driver: Add defaults for .gem_prime_export/import callbacks

The majority of drivers use drm_gem_prime_export() and
drm_gem_prime_import() for these callbacks so let's make them the
default.

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181110145647.17580-2-noralf@tronnes.org

diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst
index 5c9d86c962af963d3a8bb688f9a304b847e9bfe3..abc31956ef1543b28fe96324277ad77d01d152cb 100644 (file)
--- a/Documentation/gpu/todo.rst
+++ b/Documentation/gpu/todo.rst
@@ -234,6 +234,13 @@ efficient.
 
 Contact: Daniel Vetter
 
+Defaults for .gem_prime_import and export
+-----------------------------------------
+
+Most drivers don't need to set drm_driver->gem_prime_import and
+->gem_prime_export now that drm_gem_prime_import() and drm_gem_prime_export()
+are the default.
+
 Core refactorings
 =================
 

diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 8d54d51a6b6bffba2729c5a32d5dd55fd4d50c60..ba6c7e02a2ae111df8a27efba777ab367a6e5eb8 100644 (file)
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -529,7 +529,10 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev,
                return dmabuf;
        }
 
-       dmabuf = dev->driver->gem_prime_export(dev, obj, flags);
+       if (dev->driver->gem_prime_export)
+               dmabuf = dev->driver->gem_prime_export(dev, obj, flags);
+       else
+               dmabuf = drm_gem_prime_export(dev, obj, flags);
        if (IS_ERR(dmabuf)) {
                /* normally the created dma-buf takes ownership of the ref,
                 * but if that fails then drop the ref
@@ -762,7 +765,10 @@ int drm_gem_prime_fd_to_handle(struct drm_device *dev,
 
        /* never seen this one, need to import */
        mutex_lock(&dev->object_name_lock);
-       obj = dev->driver->gem_prime_import(dev, dma_buf);
+       if (dev->driver->gem_prime_import)
+               obj = dev->driver->gem_prime_import(dev, dma_buf);
+       else
+               obj = drm_gem_prime_import(dev, dma_buf);
        if (IS_ERR(obj)) {
                ret = PTR_ERR(obj);
                goto out_unlock;

diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index 3199ef70c007998921d300fb32753bad93dbca9c..dbb2f6ad184aacdbdb9a8d4df9ea3ba39136d9fb 100644 (file)
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -471,6 +471,8 @@ struct drm_driver {
         * @gem_prime_export:
         *
         * export GEM -> dmabuf
+        *
+        * This defaults to drm_gem_prime_export() if not set.
         */
        struct dma_buf * (*gem_prime_export)(struct drm_device *dev,
                                struct drm_gem_object *obj, int flags);
@@ -478,6 +480,8 @@ struct drm_driver {
         * @gem_prime_import:
         *
         * import dmabuf -> GEM
+        *
+        * This defaults to drm_gem_prime_import() if not set.
         */
        struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,
                                struct dma_buf *dma_buf);