1 files changed, 14 insertions, 31 deletions

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 4761adedad2a..5bbad873c798 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -91,19 +91,19 @@
 int
 drm_gem_init(struct drm_device *dev)
 {
-        struct drm_gem_mm *mm;
+        struct drm_vma_offset_manager *vma_offset_manager;
 
         mutex_init(&dev->object_name_lock);
         idr_init(&dev->object_name_idr);
 
-        mm = kzalloc(sizeof(struct drm_gem_mm), GFP_KERNEL);
-        if (!mm) {
+        vma_offset_manager = kzalloc(sizeof(*vma_offset_manager), GFP_KERNEL);
+        if (!vma_offset_manager) {
                 DRM_ERROR("out of memory\n");
                 return -ENOMEM;
         }
 
-        dev->mm_private = mm;
-        drm_vma_offset_manager_init(&mm->vma_manager,
+        dev->vma_offset_manager = vma_offset_manager;
+        drm_vma_offset_manager_init(vma_offset_manager,
                                     DRM_FILE_PAGE_OFFSET_START,
                                     DRM_FILE_PAGE_OFFSET_SIZE);
 
@@ -113,11 +113,10 @@ drm_gem_init(struct drm_device *dev)
 void
 drm_gem_destroy(struct drm_device *dev)
 {
-        struct drm_gem_mm *mm = dev->mm_private;
 
-        drm_vma_offset_manager_destroy(&mm->vma_manager);
-        kfree(mm);
-        dev->mm_private = NULL;
+        drm_vma_offset_manager_destroy(dev->vma_offset_manager);
+        kfree(dev->vma_offset_manager);
+        dev->vma_offset_manager = NULL;
 }
 
 /**
@@ -129,11 +128,12 @@ int drm_gem_object_init(struct drm_device *dev,
 {
         struct file *filp;
 
+        drm_gem_private_object_init(dev, obj, size);
+
         filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
         if (IS_ERR(filp))
                 return PTR_ERR(filp);
 
-        drm_gem_private_object_init(dev, obj, size);
         obj->filp = filp;
 
         return 0;
@@ -175,11 +175,6 @@ drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp)
         mutex_unlock(&filp->prime.lock);
 }
 
-static void drm_gem_object_ref_bug(struct kref *list_kref)
-{
-        BUG();
-}
-
 /**
  * Called after the last handle to the object has been closed
  *
@@ -195,13 +190,6 @@ static void drm_gem_object_handle_free(struct drm_gem_object *obj)
         if (obj->name) {
                 idr_remove(&dev->object_name_idr, obj->name);
                 obj->name = 0;
-                /*
-                 * The object name held a reference to this object, drop
-                 * that now.
-                *
-                * This cannot be the last reference, since the handle holds one too.
-                 */
-                kref_put(&obj->refcount, drm_gem_object_ref_bug);
         }
 }
 
@@ -374,9 +362,8 @@ void
 drm_gem_free_mmap_offset(struct drm_gem_object *obj)
 {
         struct drm_device *dev = obj->dev;
-        struct drm_gem_mm *mm = dev->mm_private;
 
-        drm_vma_offset_remove(&mm->vma_manager, &obj->vma_node);
+        drm_vma_offset_remove(dev->vma_offset_manager, &obj->vma_node);
 }
 EXPORT_SYMBOL(drm_gem_free_mmap_offset);
 
@@ -398,9 +385,8 @@ int
 drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size)
 {
         struct drm_device *dev = obj->dev;
-        struct drm_gem_mm *mm = dev->mm_private;
 
-        return drm_vma_offset_add(&mm->vma_manager, &obj->vma_node,
+        return drm_vma_offset_add(dev->vma_offset_manager, &obj->vma_node,
                                   size / PAGE_SIZE);
 }
 EXPORT_SYMBOL(drm_gem_create_mmap_offset_size);
@@ -602,9 +588,6 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
                         goto err;
 
                 obj->name = ret;
-
-                /* Allocate a reference for the name table.  */
-                drm_gem_object_reference(obj);
         }
 
         args->name = (uint64_t) obj->name;
@@ -833,7 +816,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 {
         struct drm_file *priv = filp->private_data;
         struct drm_device *dev = priv->minor->dev;
-        struct drm_gem_mm *mm = dev->mm_private;
         struct drm_gem_object *obj;
         struct drm_vma_offset_node *node;
         int ret = 0;
@@ -843,7 +825,8 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 
         mutex_lock(&dev->struct_mutex);
 
-        node = drm_vma_offset_exact_lookup(&mm->vma_manager, vma->vm_pgoff,
+        node = drm_vma_offset_exact_lookup(dev->vma_offset_manager,
+                                           vma->vm_pgoff,
                                            vma_pages(vma));
         if (!node) {
                 mutex_unlock(&dev->struct_mutex);