2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 4b3c533be859..0a5a0ca0a52e 100644
--- 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 a95db49b3f9e..ce1e6bd30306 100644
--- 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;
 };