Skip to content

Commit f6ec948

Browse files
kv2019ijnikula
authored andcommitted
drm/i915: extend audio CDCLK>=2*BCLK constraint to more platforms
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 <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 1580d3c commit f6ec948

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/i915/display/intel_audio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ static unsigned long i915_audio_component_get_power(struct device *kdev)
860860
}
861861

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

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

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

885885
intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO, cookie);

0 commit comments

Comments
 (0)