aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-11-03 00:08:00 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-08 12:10:06 -0500
commit4c2e7a5f6418775b7a7b47a62d07682c513259e0 (patch)
tree92c2ef9f42c3987a3177d93fc3a4dbf637622e0f
parenta75f36283d12d13aa278abce3a1bb6662e28fcfb (diff)
drm/i915/bdw: WaSingleSubspanDispatchOnAALinesAndPoints
Implement WaSingleSubspanDispatchOnAALinesAndPoints 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.h1
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index e1a1bb71896a..2b9e66c0c6cf 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -5001,6 +5001,7 @@
5001#define GEN7_HALF_SLICE_CHICKEN1 0xe100 /* IVB GT1 + VLV */ 5001#define GEN7_HALF_SLICE_CHICKEN1 0xe100 /* IVB GT1 + VLV */
5002#define GEN7_HALF_SLICE_CHICKEN1_GT2 0xf100 5002#define GEN7_HALF_SLICE_CHICKEN1_GT2 0xf100
5003#define GEN7_MAX_PS_THREAD_DEP (8<<12) 5003#define GEN7_MAX_PS_THREAD_DEP (8<<12)
5004#define GEN7_SINGLE_SUBSCAN_DISPATCH_ENABLE (1<<10)
5004#define GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE (1<<3) 5005#define GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE (1<<3)
5005 5006
5006#define GEN7_ROW_CHICKEN2 0xe4f4 5007#define GEN7_ROW_CHICKEN2 0xe4f4
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index ccd1b88bc24a..0a07d7c9cafc 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5300,6 +5300,9 @@ static void gen8_init_clock_gating(struct drm_device *dev)
5300 I915_WRITE(COMMON_SLICE_CHICKEN2, 5300 I915_WRITE(COMMON_SLICE_CHICKEN2,
5301 _MASKED_BIT_ENABLE(GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE)); 5301 _MASKED_BIT_ENABLE(GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE));
5302 5302
5303 I915_WRITE(GEN7_HALF_SLICE_CHICKEN1,
5304 _MASKED_BIT_ENABLE(GEN7_SINGLE_SUBSCAN_DISPATCH_ENABLE));
5305
5303 /* WaSwitchSolVfFArbitrationPriority */ 5306 /* WaSwitchSolVfFArbitrationPriority */
5304 I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | HSW_ECOCHK_ARB_PRIO_SOL); 5307 I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | HSW_ECOCHK_ARB_PRIO_SOL);
5305 5308