summarylogtreecommitdiffstats
path: root/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
diff options
context:
space:
mode:
authorgraysky2020-01-14 11:26:03 -0500
committergraysky2020-01-14 11:26:38 -0500
commitfd2cfa9c92fecf35b7a71b7204ce99051a0f3da2 (patch)
treee3bf8277b6b8f99d815d43e91182982c4dd8038b /0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
parent994418775553c62f8ebf033bc9278a10316fbcec (diff)
downloadaur-fd2cfa9c92fecf35b7a71b7204ce99051a0f3da2.tar.gz
Update to 5.4.12rc1-1
Diffstat (limited to '0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch')
-rw-r--r--0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch b/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
new file mode 100644
index 00000000000..b4ca5f406dd
--- /dev/null
+++ b/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
@@ -0,0 +1,41 @@
+From ec618d435b2b6085b623acd0a31be6f6ca9f434d 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 10/15] 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 <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 440b33762fef..05ef43b13d1c 100644
+--- a/drivers/gpu/drm/i915/display/intel_audio.c
++++ b/drivers/gpu/drm/i915/display/intel_audio.c
+@@ -858,7 +858,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))
+@@ -877,7 +877,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);
+--
+2.24.1
+