summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Vivi2012-10-10 23:35:28 +0200
committerDaniel Vetter2012-10-12 10:59:11 +0200
commiteda2d7f582d51a4b5e01d48845ea28321357b136 (patch)
tree7a8be53b035fa98d8f63b57852a333150a760f66
parentdrm/i915/dvo-ch7xxx: fix get_hw_state (diff)
downloadkernel-qcow2-linux-eda2d7f582d51a4b5e01d48845ea28321357b136.tar.gz
kernel-qcow2-linux-eda2d7f582d51a4b5e01d48845ea28321357b136.tar.xz
kernel-qcow2-linux-eda2d7f582d51a4b5e01d48845ea28321357b136.zip
drm/i915: HSW CRW stability magic
This magic brings stability to HSW CRW machines. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 04b0c070cdf8..bb941f8cd556 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3961,6 +3961,9 @@ i915_gem_init_hw(struct drm_device *dev)
if (!intel_enable_gtt())
return -EIO;
+ if (IS_HASWELL(dev) && (I915_READ(0x120010) == 1))
+ I915_WRITE(0x9008, I915_READ(0x9008) | 0xf0000);
+
i915_gem_l3_remap(dev);
i915_gem_init_swizzling(dev);