drm/prime: Simplify drm_gem_remove_prime_handles

with the reworking semantics and locking of the obj->dma_buf pointer
this pointer is always set as long as there's still a gem handle
around and a dma_buf associated with this gem object.

Also, the per file-priv lookup-cache for dma-buf importing is also
unified between foreign and native objects.

Hence we don't need to special case the clean any more and can simply
drop the clause which only runs for foreing objects, i.e. with
obj->import_attach set.

Note that with this change (actually with the previous one to always
set up obj->dma_buf even for foreign objects) it is no longer required
to set obj->import_attach when importing a foreing object. So update
comments accordingly, too.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 4b3c533be859c80f987206e62a6364930e8c9927..0a5a0ca0a52ecb038c4b4165a5a6a55a749f061b 100644 (file)
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -191,11 +191,6 @@ EXPORT_SYMBOL(drm_gem_object_alloc);
 static void
 drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp)
 {
-       if (obj->import_attach) {
-               drm_prime_remove_buf_handle(&filp->prime,
-                               obj->import_attach->dmabuf);
-       }
-
        /*
         * Note: obj->dma_buf can't disappear as long as we still hold a
         * handle reference in obj->handle_count.

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index a95db49b3f9e0cb63584ce066162878332635128..ce1e6bd303061f5839e50a220c1d3a259358f809 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -687,6 +687,11 @@ struct drm_gem_object {
         *
         * The driver's ->gem_free_object callback is responsible for cleaning
         * up the dma_buf attachment and references acquired at import time.
+        *
+        * Note that the drm gem/prime core does not depend upon drivers setting
+        * this field any more. So for drivers where this doesn't make sense
+        * (e.g. virtual devices or a displaylink behind an usb bus) they can
+        * simply leave it as NULL.
         */
        struct dma_buf_attachment *import_attach;
 };