diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-08-14 11:42:14 -0300 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-08-17 09:21:35 +0200 |
commit | a843af186c3157cee58f1cf689385ab906e1f109 (patch) | |
tree | 846f37d4ea194e61938c8e307fbb16c5c2f82775 /drivers/gpu/drm/i915/i915_gem_gtt.c | |
parent | b6c7488df68ae3660d81b149b61b55b97929da83 (diff) | |
download | linux-a843af186c3157cee58f1cf689385ab906e1f109.tar.gz linux-a843af186c3157cee58f1cf689385ab906e1f109.tar.bz2 linux-a843af186c3157cee58f1cf689385ab906e1f109.zip |
drm/i915: fix hsw uncached pte
They've changed it ... for no apparent reason. Meh.
V2: remove unused 'is_hsw' field.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_gtt.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index ee9b68f6bc36..d9a5372ec56f 100644 --- 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(); |