44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
|
||
|
|
Date: Thu, 3 Oct 2019 11:55:31 +0300
|
||
|
|
Subject: [PATCH] drm/i915: extend audio CDCLK>=2*BCLK constraint to more
|
||
|
|
platforms
|
||
|
|
|
||
|
|
commit f6ec9483091f8e67adab0311a4e2f90aab523310 upstream
|
||
|
|
|
||
|
|
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
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/i915/display/intel_audio.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
|
||
|
|
index e93776710abc..ed18511befa3 100644
|
||
|
|
--- a/drivers/gpu/drm/i915/display/intel_audio.c
|
||
|
|
+++ b/drivers/gpu/drm/i915/display/intel_audio.c
|
||
|
|
@@ -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))
|
||
|
|
@@ -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);
|
||
|
|
--
|
||
|
|
https://clearlinux.org
|
||
|
|
|