From c5aad57ded52c3b07629de50b4daaef365e6dc1d Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 12 Jan 2020 21:13:50 -0800 Subject: Updated to 5.4.11 --- ...-CDCLK-2BCLK-constraint-to-more-platforms.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 0010-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch (limited to '0010-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch') diff --git a/0010-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch b/0010-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch new file mode 100644 index 0000000..8d5b9ae --- /dev/null +++ b/0010-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch @@ -0,0 +1,40 @@ +From 975d5a884b3c80155808c2ac39e6bb6d51450dea Mon Sep 17 00:00:00 2001 +From: Kai Vehmanen +Date: Thu, 3 Oct 2019 11:55:31 +0300 +Subject: 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 +Signed-off-by: Jani Nikula +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); +-- +cgit v1.2.1-1-g437b + -- cgit v1.2.1