diff options
| author | graysky | 2020-01-03 11:08:24 -0500 |
|---|---|---|
| committer | graysky | 2020-01-03 11:08:24 -0500 |
| commit | 7478a62c68c07c04b80d59171fa421701c01db87 (patch) | |
| tree | 33ecd6eb3befe8f1c82e454954773aaca3815548 /0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch | |
| parent | 6350ed57c7daa464a71a9f8a0d4199ac0e5d8b52 (diff) | |
| download | aur-7478a62c68c07c04b80d59171fa421701c01db87.tar.gz | |
Update to 5.4.8rc1-1
Diffstat (limited to '0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch')
| -rw-r--r-- | 0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch b/0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch new file mode 100644 index 000000000000..2cf758dc7697 --- /dev/null +++ b/0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch @@ -0,0 +1,41 @@ +From b7fccafc81799d2546da531b7da3336dfefb4070 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 12/14] 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 + |