drm/i915/audio: HDMI audio gets the TMDS clock by crtc_clock

HDMI audio should use crtc_clock to get the TMDS clock.

This patch renames mode to adjusted_mode to unify the name.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Libin Yang <libin.yang@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/8945ac6bdae9c63a563bdd60b44dd316254e4752.1476111629.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 8f6cc15ca39c417d6c8c6597077ecbe98b9c5ca1..34f55f2f44d7e3875b1d4d1af87dc0bea1cabc14 100644 (file)
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -121,13 +121,14 @@ static u32 audio_config_hdmi_pixel_clock(const struct drm_display_mode *adjusted
        return hdmi_audio_clock[i].config;
 }
 
-static int audio_config_get_n(const struct drm_display_mode *mode, int rate)
+static int audio_config_get_n(const struct drm_display_mode *adjusted_mode,
+                             int rate)
 {
        int i;
 
        for (i = 0; i < ARRAY_SIZE(aud_ncts); i++) {
                if ((rate == aud_ncts[i].sample_rate) &&
-                       (mode->clock == aud_ncts[i].clock)) {
+                       (adjusted_mode->crtc_clock == aud_ncts[i].clock)) {
                        return aud_ncts[i].n;
                }
        }
@@ -267,8 +268,8 @@ hsw_hdmi_audio_config_update(struct intel_crtc *intel_crtc, enum port port,
        tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
        tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
 
-       if (adjusted_mode->clock == TMDS_296M ||
-           adjusted_mode->clock == TMDS_297M) {
+       if (adjusted_mode->crtc_clock == TMDS_296M ||
+           adjusted_mode->crtc_clock == TMDS_297M) {
                n = audio_config_get_n(adjusted_mode, rate);
                if (n != 0)
                        tmp = audio_config_setup_n_reg(n, tmp);