[Intel-gfx] [PATCH 1/2] drm/i915/gtt: Avoid calling non-existent allocate_va_range

[Chris Wilson]

On hsw and older, we do not need to allocate the ppgtt on the fly and so
ppgtt->allocate_va_range() is NULL. Fixup ppgtt_bind_vma not to call it,
in that case!

Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 35 +++++++++++++++++++----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c 
b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 21d72f695adb..b454f3489767 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -189,19 +189,30 @@ int intel_sanitize_enable_ppgtt(struct drm_i915_private 
*dev_priv,
        return 1;
 }
 
-static int ppgtt_bind_vma(struct i915_vma *vma,
-                         enum i915_cache_level cache_level,
-                         u32 unused)
+static int gen8_ppgtt_bind_vma(struct i915_vma *vma,
+                              enum i915_cache_level cache_level,
+                              u32 unused)
 {
-       u32 pte_flags;
        int ret;
 
-       if (!(vma->flags & I915_VMA_LOCAL_BIND)) {
-               ret = vma->vm->allocate_va_range(vma->vm, vma->node.start,
-                                                vma->size);
-               if (ret)
-                       return ret;
-       }
+       GEM_BUG_ON(vma->flags & I915_VMA_LOCAL_BIND);
+
+       ret = vma->vm->allocate_va_range(vma->vm, vma->node.start, vma->size);
+       if (ret)
+               return ret;
+
+       vma->vm->insert_entries(vma->vm, vma, cache_level, 0);
+
+       return 0;
+}
+
+static int gen6_ppgtt_bind_vma(struct i915_vma *vma,
+                              enum i915_cache_level cache_level,
+                              u32 unused)
+{
+       u32 pte_flags;
+
+       GEM_BUG_ON(vma->flags & I915_VMA_LOCAL_BIND);
 
        /* Currently applicable only to VLV */
        pte_flags = 0;
@@ -1635,8 +1646,8 @@ static int gen8_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
                gen8_ppgtt_notify_vgt(ppgtt, true);
 
        ppgtt->base.cleanup = gen8_ppgtt_cleanup;
+       ppgtt->base.bind_vma = gen8_ppgtt_bind_vma;
        ppgtt->base.unbind_vma = ppgtt_unbind_vma;
-       ppgtt->base.bind_vma = ppgtt_bind_vma;
        ppgtt->base.set_pages = ppgtt_set_pages;
        ppgtt->base.clear_pages = clear_pages;
        ppgtt->debug_dump = gen8_dump_ppgtt;
@@ -2078,8 +2089,8 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
 
        ppgtt->base.clear_range = gen6_ppgtt_clear_range;
        ppgtt->base.insert_entries = gen6_ppgtt_insert_entries;
+       ppgtt->base.bind_vma = gen6_ppgtt_bind_vma;
        ppgtt->base.unbind_vma = ppgtt_unbind_vma;
-       ppgtt->base.bind_vma = ppgtt_bind_vma;
        ppgtt->base.set_pages = ppgtt_set_pages;
        ppgtt->base.clear_pages = clear_pages;
        ppgtt->base.cleanup = gen6_ppgtt_cleanup;
-- 
2.17.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx