Commit a7c4efbf authored by Libin Yang's avatar Libin Yang Committed by Jani Nikula

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarLibin Yang <libin.yang@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/8945ac6bdae9c63a563bdd60b44dd316254e4752.1476111629.git.jani.nikula@intel.com
parent 4bd2d6f6
...@@ -121,13 +121,14 @@ static u32 audio_config_hdmi_pixel_clock(const struct drm_display_mode *adjusted ...@@ -121,13 +121,14 @@ static u32 audio_config_hdmi_pixel_clock(const struct drm_display_mode *adjusted
return hdmi_audio_clock[i].config; 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; int i;
for (i = 0; i < ARRAY_SIZE(aud_ncts); i++) { for (i = 0; i < ARRAY_SIZE(aud_ncts); i++) {
if ((rate == aud_ncts[i].sample_rate) && 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; return aud_ncts[i].n;
} }
} }
...@@ -267,8 +268,8 @@ hsw_hdmi_audio_config_update(struct intel_crtc *intel_crtc, enum port port, ...@@ -267,8 +268,8 @@ hsw_hdmi_audio_config_update(struct intel_crtc *intel_crtc, enum port port,
tmp &= ~AUD_CONFIG_N_PROG_ENABLE; tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
tmp |= audio_config_hdmi_pixel_clock(adjusted_mode); tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
if (adjusted_mode->clock == TMDS_296M || if (adjusted_mode->crtc_clock == TMDS_296M ||
adjusted_mode->clock == TMDS_297M) { adjusted_mode->crtc_clock == TMDS_297M) {
n = audio_config_get_n(adjusted_mode, rate); n = audio_config_get_n(adjusted_mode, rate);
if (n != 0) if (n != 0)
tmp = audio_config_setup_n_reg(n, tmp); tmp = audio_config_setup_n_reg(n, tmp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment