drm/i915: do AUD_FREQ_CNTRL state save on all gen9+ platforms

Replace the TGL/ICL specific platform checks with a more generic check
using INTEL_GEN(). Fixes bug with broken audio after S3 resume on JSL
platforms.

An initial version of state save and restore of AUD_FREQ_CNTRL register
was added for subset of platforms in commit 87c1694533c9
("drm/i915: save AUD_FREQ_CNTRL state at audio domain suspend"). The state
save has proven to work well and it is needed in newer platforms, so needs
to be extended. Although the logic is not in practise needed on GEN9/10
systems, follow the hardware specification and apply state and restore on
all gen9+ platforms.

Bspec: 49281
Link: https://github.com/thesofproject/linux/issues/1719
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200330144421.11632-1-kai.vehmanen@linux.intel.com
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
index 47402c2..57b8097 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_audio.c
@@ -893,7 +893,7 @@ static unsigned long i915_audio_component_get_power(struct device *kdev)
        ret = intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
 
        if (dev_priv->audio_power_refcount++ == 0) {
-               if (IS_TIGERLAKE(dev_priv) || IS_ICELAKE(dev_priv)) {
+               if (INTEL_GEN(dev_priv) >= 9) {
                        intel_de_write(dev_priv, AUD_FREQ_CNTRL,
                                       dev_priv->audio_freq_cntrl);
                        drm_dbg_kms(&dev_priv->drm,
@@ -1175,7 +1175,7 @@ static void i915_audio_component_init(struct drm_i915_private *dev_priv)
                return;
        }
 
-       if (IS_TIGERLAKE(dev_priv) || IS_ICELAKE(dev_priv)) {
+       if (INTEL_GEN(dev_priv) >= 9) {
                dev_priv->audio_freq_cntrl = intel_de_read(dev_priv,
                                                           AUD_FREQ_CNTRL);
                drm_dbg_kms(&dev_priv->drm,