drm/i915: Remove i915_vma_create from VMA API

With the introduce of i915_vma_instance() for obtaining the VMA
singleton for a (obj, vm, view) tuple, we can remove the
i915_vma_create() in favour of a single entry point. We do incur a
lookup onto an empty tree, but the i915_vma_create() were being called
infrequently and during initialisation, so the small overhead is
negligible.

v2: Drop the i915_ prefix from the now static vma_create() function

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170116152131.18089-4-chris@chris-wilson.co.uk

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 49fa8006c6a2..69035e4f9b3b 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1738,7 +1738,7 @@ static int init_status_page(struct intel_engine_cs *engine)
         if (ret)
                 goto err;
 
-        vma = i915_vma_create(obj, &engine->i915->ggtt.base, NULL);
+        vma = i915_vma_instance(obj, &engine->i915->ggtt.base, NULL);
         if (IS_ERR(vma)) {
                 ret = PTR_ERR(vma);
                 goto err;
@@ -1872,7 +1872,7 @@ intel_ring_create_vma(struct drm_i915_private *dev_priv, int size)
         /* mark ring buffers as read-only from GPU side by default */
         obj->gt_ro = 1;
 
-        vma = i915_vma_create(obj, &dev_priv->ggtt.base, NULL);
+        vma = i915_vma_instance(obj, &dev_priv->ggtt.base, NULL);
         if (IS_ERR(vma))
                 goto err;
 
@@ -2462,7 +2462,7 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,
                 if (IS_ERR(obj))
                         goto err;
 
-                vma = i915_vma_create(obj, &dev_priv->ggtt.base, NULL);
+                vma = i915_vma_instance(obj, &dev_priv->ggtt.base, NULL);
                 if (IS_ERR(vma))
                         goto err_obj;