AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-19 10:06:08 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Imre Deak <imre.deak@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459515767-29228-13-git-send-email-imre.deak@intel.com
This commit is contained in:
Imre Deak 2016-04-01 16:02:43 +03:00
parent d7d7c9ee69
commit c2e001ef84
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/drm/i915/intel_display.c
View File

@ -5446,14 +5446,38 @@ static void broxton_set_cdclk(struct drm_i915_private *dev_priv, int frequency)
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)
{
/* check if cd clock is enabled */
if (I915_READ(BXT_DE_PLL_ENABLE) & BXT_DE_PLL_PLL_ENABLE) {
DRM_DEBUG_KMS("Display already initialized\n");
if (broxton_cdclk_is_enabled(dev_priv)) {
DRM_DEBUG_KMS("CDCLK already enabled, won't reprogram it\n");
return;
}
DRM_DEBUG_KMS("CDCLK not enabled, enabling it\n");
/*
* FIXME:
* - The initial CDCLK needs to be read from VBT.