Commit c2e001ef authored by Imre Deak's avatar Imre Deak

drm/i915/bxt: Sanitize the DBUF HW state together with CDCLK

When determining whether CDCLK is enabled by BIOS and so we should skip
reprogramming it, we didn't check the related DBUF power request and
state. In theory BIOS could enable one without the other so check for
this case and reprogram things if something is amiss.
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459515767-29228-13-git-send-email-imre.deak@intel.com
parent d7d7c9ee
...@@ -5446,14 +5446,38 @@ static void broxton_set_cdclk(struct drm_i915_private *dev_priv, int frequency) ...@@ -5446,14 +5446,38 @@ static void broxton_set_cdclk(struct drm_i915_private *dev_priv, int frequency)
intel_update_cdclk(dev_priv->dev); intel_update_cdclk(dev_priv->dev);
} }
static bool broxton_cdclk_is_enabled(struct drm_i915_private *dev_priv)
{
if (!(I915_READ(BXT_DE_PLL_ENABLE) & BXT_DE_PLL_PLL_ENABLE))
return false;
/* TODO: Check for a valid CDCLK rate */
if (!(I915_READ(DBUF_CTL) & DBUF_POWER_REQUEST)) {
DRM_DEBUG_DRIVER("CDCLK enabled, but DBUF power not requested\n");
return false;
}
if (!(I915_READ(DBUF_CTL) & DBUF_POWER_STATE)) {
DRM_DEBUG_DRIVER("CDCLK enabled, but DBUF power hasn't settled\n");
return false;
}
return true;
}
void broxton_init_cdclk(struct drm_i915_private *dev_priv) void broxton_init_cdclk(struct drm_i915_private *dev_priv)
{ {
/* check if cd clock is enabled */ /* check if cd clock is enabled */
if (I915_READ(BXT_DE_PLL_ENABLE) & BXT_DE_PLL_PLL_ENABLE) { if (broxton_cdclk_is_enabled(dev_priv)) {
DRM_DEBUG_KMS("Display already initialized\n"); DRM_DEBUG_KMS("CDCLK already enabled, won't reprogram it\n");
return; return;
} }
DRM_DEBUG_KMS("CDCLK not enabled, enabling it\n");
/* /*
* FIXME: * FIXME:
* - The initial CDCLK needs to be read from VBT. * - The initial CDCLK needs to be read from VBT.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment