aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2013-03-08 13:45:51 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-03-23 07:18:00 -0400
commitd3bc03030a3994181d420e9f3b858fe6edd71839 (patch)
tree946b30a135b2460cb78607945d5efe25b7029106
parentd7fee5f6faea17b6e702eba90037ab8f716faf8e (diff)
drm/i915: fix WaDisablePSDDualDispatchEnable on VLV v2
Can prevent a hang when we get to tessellation. We need to set bit 15 as well for this workaround. v2: update changelog with accurate info Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 52d4f2d660db..0bb94d963b0a 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3899,8 +3899,10 @@ static void valleyview_init_clock_gating(struct drm_device *dev)
3899 CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE | 3899 CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE |
3900 CHICKEN3_DGMG_DONE_FIX_DISABLE); 3900 CHICKEN3_DGMG_DONE_FIX_DISABLE);
3901 3901
3902 /* WaDisablePSDDualDispatchEnable */
3902 I915_WRITE(GEN7_HALF_SLICE_CHICKEN1, 3903 I915_WRITE(GEN7_HALF_SLICE_CHICKEN1,
3903 _MASKED_BIT_ENABLE(GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE)); 3904 _MASKED_BIT_ENABLE(GEN7_MAX_PS_THREAD_DEP |
3905 GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE));
3904 3906
3905 /* Apply the WaDisableRHWOOptimizationForRenderHang workaround. */ 3907 /* Apply the WaDisableRHWOOptimizationForRenderHang workaround. */
3906 I915_WRITE(GEN7_COMMON_SLICE_CHICKEN1, 3908 I915_WRITE(GEN7_COMMON_SLICE_CHICKEN1,