summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_pm.c
diff options
context:
space:
mode:
authorVille Syrjälä2014-04-09 12:28:36 +0200
committerDaniel Vetter2014-05-20 15:19:38 +0200
commitacea6f9573904a9591244123afc769139bbd3fc6 (patch)
tree9e9198c37006fc7ff3ba34d66ad1ecbe637a0052 /drivers/gpu/drm/i915/intel_pm.c
parentdrm/i915/chv: Implement WaVSRefCountFullforceMissDisable:chv and WaDSRefCount... (diff)
downloadkernel-qcow2-linux-acea6f9573904a9591244123afc769139bbd3fc6.tar.gz
kernel-qcow2-linux-acea6f9573904a9591244123afc769139bbd3fc6.tar.xz
kernel-qcow2-linux-acea6f9573904a9591244123afc769139bbd3fc6.zip
drm/i915/chv: Implement WaDisableSemaphoreAndSyncFlipWait:chv
BDW has the same requirement but the w/a database doens't list this w/a for BDW. Seems to be another one of those "stick a bunch of known workarounds into this bag and write something on the label" type of things. Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 7220c11e60b4..7bf23c04dcbe 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5389,6 +5389,10 @@ static void cherryview_init_clock_gating(struct drm_device *dev)
I915_WRITE(GEN7_FF_THREAD_MODE,
I915_READ(GEN7_FF_THREAD_MODE) &
~(GEN8_FF_DS_REF_CNT_FFME | GEN7_FF_VS_REF_CNT_FFME));
+
+ /* WaDisableSemaphoreAndSyncFlipWait:chv */
+ I915_WRITE(GEN6_RC_SLEEP_PSMI_CONTROL,
+ _MASKED_BIT_ENABLE(GEN8_RC_SEMA_IDLE_MSG_DISABLE));
}
static void g4x_init_clock_gating(struct drm_device *dev)