Skip to content

Commit

Permalink
drm/i915: extend audio CDCLK>=2*BCLK constraint to more platforms
Browse files Browse the repository at this point in the history
The CDCLK>=2*BCLK constraint applies to all generations since gen10.
Extend the constraint logic in audio get/put_power().

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191003085531.30990-2-kai.vehmanen@linux.intel.com
  • Loading branch information
kv2019i authored and jnikula committed Oct 4, 2019
1 parent 1580d3c commit f6ec948
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/display/intel_audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ static unsigned long i915_audio_component_get_power(struct device *kdev)
}

/* Force CDCLK to 2*BCLK as long as we need audio powered. */
if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
glk_force_audio_cdclk(dev_priv, true);

if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
Expand All @@ -879,7 +879,7 @@ static void i915_audio_component_put_power(struct device *kdev,

/* Stop forcing CDCLK to 2*BCLK if no need for audio to be powered. */
if (--dev_priv->audio_power_refcount == 0)
if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
glk_force_audio_cdclk(dev_priv, false);

intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO, cookie);
Expand Down

0 comments on commit f6ec948

Please sign in to comment.