diff options
| author | Patrik Jakobsson | 2016-02-18 16:21:11 +0100 |
|---|---|---|
| committer | Imre Deak | 2016-02-22 16:18:21 +0100 |
| commit | 832dba889e27487c3087149f1039acc3feb89003 (patch) | |
| tree | a6e121255752fde2aaf8a0b2fd347b000df09977 /drivers/gpu/drm/i915/intel_runtime_pm.c | |
| parent | drm/i915/fbc: enable FBC by default on HSW and BDW (diff) | |
| download | kernel-qcow2-linux-832dba889e27487c3087149f1039acc3feb89003.tar.gz kernel-qcow2-linux-832dba889e27487c3087149f1039acc3feb89003.tar.xz kernel-qcow2-linux-832dba889e27487c3087149f1039acc3feb89003.zip | |
drm/i915/gen9: Check for DC state mismatch
The DMC can incorrectly run off and allow DC states on it's own. We
don't know the root-cause for this yet but this patch makes it more
visible.
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1455808874-22089-2-git-send-email-mika.kuoppala@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_runtime_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_runtime_pm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index a2e367cf99a2..8b9290fdb3b2 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -494,10 +494,18 @@ static void gen9_set_dc_state(struct drm_i915_private *dev_priv, uint32_t state) val = I915_READ(DC_STATE_EN); DRM_DEBUG_KMS("Setting DC state from %02x to %02x\n", val & mask, state); + + /* Check if DMC is ignoring our DC state requests */ + if ((val & mask) != dev_priv->csr.dc_state) + DRM_ERROR("DC state mismatch (0x%x -> 0x%x)\n", + dev_priv->csr.dc_state, val & mask); + val &= ~mask; val |= state; I915_WRITE(DC_STATE_EN, val); POSTING_READ(DC_STATE_EN); + + dev_priv->csr.dc_state = val & mask; } void bxt_enable_dc9(struct drm_i915_private *dev_priv) |