1 files changed, 19 insertions, 2 deletions

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 4012fe423460..7c5b5f78f1fa 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -211,6 +211,8 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)
         idr_remove(&filp->object_idr, handle);
         spin_unlock(&filp->table_lock);
 
+        if (dev->driver->gem_close_object)
+                dev->driver->gem_close_object(obj, filp);
         drm_gem_object_handle_unreference_unlocked(obj);
 
         return 0;
@@ -227,7 +229,8 @@ drm_gem_handle_create(struct drm_file *file_priv,
                        struct drm_gem_object *obj,
                        u32 *handlep)
 {
-        int     ret;
+        struct drm_device *dev = obj->dev;
+        int ret;
 
         /*
          * Get the user-visible handle using idr.
@@ -248,6 +251,15 @@ again:
                 return ret;
 
         drm_gem_object_handle_reference(obj);
+
+        if (dev->driver->gem_open_object) {
+                ret = dev->driver->gem_open_object(obj, file_priv);
+                if (ret) {
+                        drm_gem_handle_delete(file_priv, *handlep);
+                        return ret;
+                }
+        }
+
         return 0;
 }
 EXPORT_SYMBOL(drm_gem_handle_create);
@@ -402,7 +414,12 @@ drm_gem_open(struct drm_device *dev, struct drm_file *file_private)
 static int
 drm_gem_object_release_handle(int id, void *ptr, void *data)
 {
+        struct drm_file *file_priv = data;
         struct drm_gem_object *obj = ptr;
+        struct drm_device *dev = obj->dev;
+
+        if (dev->driver->gem_close_object)
+                dev->driver->gem_close_object(obj, file_priv);
 
         drm_gem_object_handle_unreference_unlocked(obj);
 
@@ -418,7 +435,7 @@ void
 drm_gem_release(struct drm_device *dev, struct drm_file *file_private)
 {
         idr_for_each(&file_private->object_idr,
-                     &drm_gem_object_release_handle, NULL);
+                     &drm_gem_object_release_handle, file_private);
 
         idr_remove_all(&file_private->object_idr);
         idr_destroy(&file_private->object_idr);