[Bug 91133] [gm45][BISECTED] Invalid GTT entry during Command Fetch from CS prefetch crossing page boundary

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=91133

--- Comment #41 from Chris Wilson <chris at chris-wilson.co.uk> ---
It's just the last chunk of

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c
b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 9d3852c521c7..9b304f28b4d3 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1924,13 +1924,13 @@ static int ggtt_bind_vma(struct i915_vma *vma,
                pte_flags |= PTE_READ_ONLY;


-       if (!dev_priv->mm.aliasing_ppgtt || flags & GLOBAL_BIND) {
+       if (flags & GLOBAL_BIND) {
                vma->vm->insert_entries(vma->vm, pages,
                                        vma->node.start,
                                        cache_level, pte_flags);
        }

-       if (dev_priv->mm.aliasing_ppgtt && flags & LOCAL_BIND) {
+       if (flags & LOCAL_BIND && dev_priv->mm.aliasing_ppgtt) {
                struct i915_hw_ppgtt *appgtt = dev_priv->mm.aliasing_ppgtt;
                appgtt->base.insert_entries(&appgtt->base, pages,
                                            vma->node.start,
@@ -1953,7 +1953,7 @@ static void ggtt_unbind_vma(struct i915_vma *vma)
                                     true);
        }

-       if (dev_priv->mm.aliasing_ppgtt && vma->bound & LOCAL_BIND) {
+       if (vma->bound & LOCAL_BIND && dev_priv->mm.aliasing_ppgtt) {
                struct i915_hw_ppgtt *appgtt = dev_priv->mm.aliasing_ppgtt;
                appgtt->base.clear_range(&appgtt->base,
                                         vma->node.start,
@@ -2809,7 +2809,7 @@ int i915_vma_bind(struct i915_vma *vma, enum
i915_cache_level cache_level,
                return -EINVAL;

        bind_flags = 0;
-       if (flags & PIN_GLOBAL)
+       if (flags & PIN_GLOBAL || !dev_priv->mm.aliasing_ppgtt)
                bind_flags |= GLOBAL_BIND;
        if (flags & PIN_USER)
                bind_flags |= LOCAL_BIND;

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are on the CC list for the bug.
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20150729/58ae03d9/attachment-0001.html>