aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-11-03 00:07:59 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-08 12:10:06 -0500
commita75f36283d12d13aa278abce3a1bb6662e28fcfb (patch)
tree3f286a9ab97ad12b99143c5a936f1c5188121660
parent7f88da0cf6947c3b6a5ccad6c37336367dd69159 (diff)
drm/i915/bdw: conservative SBE VUE cache mode
Hold vertex data in cache until last reference BDW-A workaround 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_reg.h2
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index c0b398572c2a..e1a1bb71896a 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4133,6 +4133,8 @@
4133/* GEN7 chicken */ 4133/* GEN7 chicken */
4134#define GEN7_COMMON_SLICE_CHICKEN1 0x7010 4134#define GEN7_COMMON_SLICE_CHICKEN1 0x7010
4135# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26)) 4135# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26))
4136#define COMMON_SLICE_CHICKEN2 0x7014
4137# define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0)
4136 4138
4137#define GEN7_L3CNTLREG1 0xB01C 4139#define GEN7_L3CNTLREG1 0xB01C
4138#define GEN7_WA_FOR_GEN7_L3_CONTROL 0x3C4FFF8C 4140#define GEN7_WA_FOR_GEN7_L3_CONTROL 0x3C4FFF8C
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 5dceb56f6ceb..ccd1b88bc24a 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5297,6 +5297,9 @@ static void gen8_init_clock_gating(struct drm_device *dev)
5297 I915_WRITE(_3D_CHICKEN3, 5297 I915_WRITE(_3D_CHICKEN3,
5298 _3D_CHICKEN_SDE_LIMIT_FIFO_POLY_DEPTH(2)); 5298 _3D_CHICKEN_SDE_LIMIT_FIFO_POLY_DEPTH(2));
5299 5299
5300 I915_WRITE(COMMON_SLICE_CHICKEN2,
5301 _MASKED_BIT_ENABLE(GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE));
5302
5300 /* WaSwitchSolVfFArbitrationPriority */ 5303 /* WaSwitchSolVfFArbitrationPriority */
5301 I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | HSW_ECOCHK_ARB_PRIO_SOL); 5304 I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | HSW_ECOCHK_ARB_PRIO_SOL);
5302 5305