Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_gem_gtt.c

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 8329a14862ed23bbdebca3c6065f2471b14f4b21..18477314d85dbc5d0931d441c66a430026c7bd28 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -261,7 +261,10 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt,
                pte_flags |= GEN6_PTE_CACHE_LLC;
                break;
        case I915_CACHE_NONE:
-               pte_flags |= GEN6_PTE_UNCACHED;
+               if (IS_HASWELL(dev))
+                       pte_flags |= HSW_PTE_UNCACHED;
+               else
+                       pte_flags |= GEN6_PTE_UNCACHED;
                break;
        default:
                BUG();