2 files changed, 19 insertions, 12 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 06a88be067f1..9f4c27eab046 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1302,6 +1302,7 @@ int i915_gem_wait_ioctl(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
 void i915_gem_load(struct drm_device *dev);
 int i915_gem_init_object(struct drm_gem_object *obj);
+void i915_gem_object_init(struct drm_i915_gem_object *obj);
 struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,
                                                   size_t size);
 void i915_gem_free_object(struct drm_gem_object *obj);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index eb54a6d81517..553175856e81 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3558,10 +3558,26 @@ unlock:
         return ret;
 }
 
+void i915_gem_object_init(struct drm_i915_gem_object *obj)
+{
+        obj->base.driver_private = NULL;
+
+        INIT_LIST_HEAD(&obj->mm_list);
+        INIT_LIST_HEAD(&obj->gtt_list);
+        INIT_LIST_HEAD(&obj->ring_list);
+        INIT_LIST_HEAD(&obj->exec_list);
+
+        obj->fence_reg = I915_FENCE_REG_NONE;
+        obj->madv = I915_MADV_WILLNEED;
+        /* Avoid an unnecessary call to unbind on the first bind. */
+        obj->map_and_fenceable = true;
+
+        i915_gem_info_add_obj(obj->base.dev->dev_private, obj->base.size);
+}
+
 struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,
                                                   size_t size)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *obj;
         struct address_space *mapping;
         u32 mask;
@@ -3585,7 +3601,7 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,
         mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping;
         mapping_set_gfp_mask(mapping, mask);
 
-        i915_gem_info_add_obj(dev_priv, size);
+        i915_gem_object_init(obj);
 
         obj->base.write_domain = I915_GEM_DOMAIN_CPU;
         obj->base.read_domains = I915_GEM_DOMAIN_CPU;
@@ -3607,16 +3623,6 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,
         } else
                 obj->cache_level = I915_CACHE_NONE;
 
-        obj->base.driver_private = NULL;
-        obj->fence_reg = I915_FENCE_REG_NONE;
-        INIT_LIST_HEAD(&obj->mm_list);
-        INIT_LIST_HEAD(&obj->gtt_list);
-        INIT_LIST_HEAD(&obj->ring_list);
-        INIT_LIST_HEAD(&obj->exec_list);
-        obj->madv = I915_MADV_WILLNEED;
-        /* Avoid an unnecessary call to unbind on the first bind. */
-        obj->map_and_fenceable = true;
-
         return obj;
 }