Merge tag 'drm-intel-next-2017-03-06' of git://anongit.freedesktop.org/git/drm-intel...

[mirror_ubuntu-eoan-kernel.git] / drivers / gpu / drm / i915 / intel_audio.c

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index d76f3033e890b6da60ae6b017dab311e9a29c8da..52c207e81f413a4465bec60098fedf09efea59cb 100644 (file)
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -720,7 +720,7 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
        struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
        u32 tmp;
 
-       if (!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv))
+       if (!IS_GEN9_BC(dev_priv))
                return;
 
        i915_audio_component_get_power(kdev);
@@ -752,7 +752,7 @@ static int i915_audio_component_get_cdclk_freq(struct device *kdev)
        if (WARN_ON_ONCE(!HAS_DDI(dev_priv)))
                return -ENODEV;
 
-       return dev_priv->cdclk_freq;
+       return dev_priv->cdclk.hw.cdclk;
 }
 
 /*