Merge branch 'topic/drm-sync-audio-rate' into for-next

diff --combined drivers/gpu/drm/i915/intel_audio.c
index bf2642eb4ee7efed240e7c1a1605c55d6f30e6ec,dffd0b4c5f1792a994592f7166342af3f112545c..ae8df0a43de68a154685d84001f29f31b66a463c
--- 1/drivers/gpu/drm/i915/intel_audio.c
--- 2/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@@ -144,7 -144,7 +144,7 @@@ static uint32_t audio_config_setup_n_re
  
  /* check whether N/CTS/M need be set manually */
  static bool audio_rate_need_prog(struct intel_crtc *crtc,
-                                       struct drm_display_mode *mode)
+                                const struct drm_display_mode *mode)
  {
        if (((mode->clock == TMDS_297M) ||
                 (mode->clock == TMDS_296M)) &&
@@@ -524,7 -524,7 +524,7 @@@ void intel_audio_codec_enable(struct in
  
  /**
   * intel_audio_codec_disable - Disable the audio codec for HD audio
 - * @encoder: encoder on which to disable audio
 + * @intel_encoder: encoder on which to disable audio
   *
   * The disable sequences must be performed before disabling the transcoder or
   * port.