[PATCH 4/4] drm/gem: Inline drm_gem_pin() into PRIME helpers

[Thomas Zimmermann]

Inline drm_gem_pin() into its only caller drm_gem_map_attach()
and update the documentation in the callback's purpose. Do the
equivalent for drm_gem_unpin(). Also add stricter error checking
on the involved locking.

The pin operation in the GEM object functions is a helper for
PRIME-exported buffer objects. Having drm_gem_pin() gives the
impression of a general-purpose interface, which is not the case.
Removing it makes the pin callback a bit harder to misuse.

Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
---
 drivers/gpu/drm/drm_gem.c      | 32 --------------------------------
 drivers/gpu/drm/drm_internal.h |  4 ----
 drivers/gpu/drm/drm_prime.c    | 22 ++++++++++++++++++++--
 include/drm/drm_gem.h          |  3 ++-
 4 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 1e659d2660f73..a0a3b6baa5690 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -1184,38 +1184,6 @@ void drm_gem_print_info(struct drm_printer *p, unsigned 
int indent,
                obj->funcs->print_info(p, indent, obj);
 }
 
-int drm_gem_pin_locked(struct drm_gem_object *obj)
-{
-       if (obj->funcs->pin)
-               return obj->funcs->pin(obj);
-
-       return 0;
-}
-
-void drm_gem_unpin_locked(struct drm_gem_object *obj)
-{
-       if (obj->funcs->unpin)
-               obj->funcs->unpin(obj);
-}
-
-int drm_gem_pin(struct drm_gem_object *obj)
-{
-       int ret;
-
-       dma_resv_lock(obj->resv, NULL);
-       ret = drm_gem_pin_locked(obj);
-       dma_resv_unlock(obj->resv);
-
-       return ret;
-}
-
-void drm_gem_unpin(struct drm_gem_object *obj)
-{
-       dma_resv_lock(obj->resv, NULL);
-       drm_gem_unpin_locked(obj);
-       dma_resv_unlock(obj->resv);
-}
-
 int drm_gem_vmap_locked(struct drm_gem_object *obj, struct iosys_map *map)
 {
        int ret;
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index e44f28fd81d34..442eb31351ddd 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -175,10 +175,6 @@ void drm_gem_release(struct drm_device *dev, struct 
drm_file *file_private);
 void drm_gem_print_info(struct drm_printer *p, unsigned int indent,
                        const struct drm_gem_object *obj);
 
-int drm_gem_pin_locked(struct drm_gem_object *obj);
-void drm_gem_unpin_locked(struct drm_gem_object *obj);
-int drm_gem_pin(struct drm_gem_object *obj);
-void drm_gem_unpin(struct drm_gem_object *obj);
 int drm_gem_vmap_locked(struct drm_gem_object *obj, struct iosys_map *map);
 void drm_gem_vunmap_locked(struct drm_gem_object *obj, struct iosys_map *map);
 
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index d828502268b8e..a1852c02f5123 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -599,6 +599,7 @@ int drm_gem_map_attach(struct dma_buf *dma_buf,
                       struct dma_buf_attachment *attach)
 {
        struct drm_gem_object *obj = dma_buf->priv;
+       int ret;
 
        /*
         * drm_gem_map_dma_buf() requires obj->get_sg_table(), but drivers
@@ -608,7 +609,16 @@ int drm_gem_map_attach(struct dma_buf *dma_buf,
            !obj->funcs->get_sg_table)
                return -ENOSYS;
 
-       return drm_gem_pin(obj);
+       if (!obj->funcs->pin)
+               return 0;
+
+       ret = dma_resv_lock(obj->resv, NULL);
+       if (ret)
+               return ret;
+       ret = obj->funcs->pin(obj);
+       dma_resv_unlock(obj->resv);
+
+       return ret;
 }
 EXPORT_SYMBOL(drm_gem_map_attach);
 
@@ -625,8 +635,16 @@ void drm_gem_map_detach(struct dma_buf *dma_buf,
                        struct dma_buf_attachment *attach)
 {
        struct drm_gem_object *obj = dma_buf->priv;
+       int ret;
 
-       drm_gem_unpin(obj);
+       if (!obj->funcs->unpin)
+               return;
+
+       ret = dma_resv_lock(obj->resv, NULL);
+       if (drm_WARN_ON(obj->dev, ret))
+               return;
+       obj->funcs->unpin(obj);
+       dma_resv_unlock(obj->resv);
 }
 EXPORT_SYMBOL(drm_gem_map_detach);
 
diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
index 9b71f7a9f3f8a..498485f4501f9 100644
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@ -126,7 +126,8 @@ struct drm_gem_object_funcs {
        /**
         * @pin:
         *
-        * Pin backing buffer in memory. Used by the drm_gem_map_attach() 
helper.
+        * Pin backing buffer in memory, such that importers can access it.
+        * Used by the drm_gem_map_attach() helper.
         *
         * This callback is optional.
         */
-- 
2.49.0