From 4d5f1209d6300f087079490a6398fb3d47e9b0a6 Mon Sep 17 00:00:00 2001 From: Rodrigo Vivi Date: Wed, 10 Oct 2012 18:35:28 -0300 Subject: [PATCH] --- yaml --- r: 334387 b: refs/heads/master c: eda2d7f582d51a4b5e01d48845ea28321357b136 h: refs/heads/master i: 334385: 4f7b1b3bdfa37e71dabcb620c4b98d84b7665463 334383: da0cab44e1b6c56ddda94bb5e89c430ff5f791ac v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c3305fd930a4..fc126c6951fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4afa0ace429624fde392b29d05a803672a41192e +refs/heads/master: eda2d7f582d51a4b5e01d48845ea28321357b136 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 04b0c070cdf8..bb941f8cd556 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/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);