summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-11-02 21:07:57 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-08 18:10:05 +0100
commitbf66347cd3a3e947d4eff5bafa6c72283c2411ed (patch)
treeb7d66c3d40f0bd1220ae3139478b4f0ae0cf3183
parentfd392b6003ae79c8abfb077be76e0a4b4cea8e3e (diff)
downloadblackbird-op-linux-bf66347cd3a3e947d4eff5bafa6c72283c2411ed.tar.gz
blackbird-op-linux-bf66347cd3a3e947d4eff5bafa6c72283c2411ed.zip
drm/i915/bdw: Sampler power bypass disable
BDW-A workaround. BDW Bug #1899812 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.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index ffd103a5d472..1d557291fb28 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -5009,6 +5009,7 @@
#define HALF_SLICE_CHICKEN3 0xe184
#define GEN8_CENTROID_PIXEL_OPT_DIS (1<<8)
+#define GEN8_SAMPLER_POWER_BYPASS_DIS (1<<1)
#define G4X_AUD_VID_DID (dev_priv->info->display_mmio_offset + 0x62020)
#define INTEL_AUDIO_DEVCL 0x808629FB
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index e036ba06be99..7e0039e8c2d4 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5290,6 +5290,8 @@ static void gen8_init_clock_gating(struct drm_device *dev)
"GEN8_CENTROID_PIXEL_OPT_DIS not be needed for production\n");
I915_WRITE(HALF_SLICE_CHICKEN3,
_MASKED_BIT_ENABLE(GEN8_CENTROID_PIXEL_OPT_DIS));
+ I915_WRITE(HALF_SLICE_CHICKEN3,
+ _MASKED_BIT_ENABLE(GEN8_SAMPLER_POWER_BYPASS_DIS));
I915_WRITE(GAMTARBMODE, _MASKED_BIT_ENABLE(ARB_MODE_BWGTLB_DISABLE));
/* WaSwitchSolVfFArbitrationPriority */
OpenPOWER on IntegriCloud