drm/i915/audio: drop extra crtc clock check from HDMI audio N lookup

The array contains the crtc clock, rely on that. While at it, debug log
the HDMI N value or automatic mode.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: "Lin, Mengdong" <mengdong.lin@intel.com>
Cc: Libin Yang <libin.yang@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477407258-30599-2-git-send-email-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 7093cfbb62b1ee4dda1d8f496048d6780c9f7087..1a5c212094468c172c77bccb3ce10321fd513eec 100644 (file)
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -254,16 +254,15 @@ 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->crtc_clock == TMDS_296M ||
-           adjusted_mode->crtc_clock == TMDS_297M) {
-               n = audio_config_hdmi_get_n(adjusted_mode, rate);
-               if (n != 0) {
-                       tmp &= ~AUD_CONFIG_N_MASK;
-                       tmp |= AUD_CONFIG_N(n);
-                       tmp |= AUD_CONFIG_N_PROG_ENABLE;
-               } else {
-                       DRM_DEBUG_KMS("no suitable N value is found\n");
-               }
+       n = audio_config_hdmi_get_n(adjusted_mode, rate);
+       if (n != 0) {
+               DRM_DEBUG_KMS("using N %d\n", n);
+
+               tmp &= ~AUD_CONFIG_N_MASK;
+               tmp |= AUD_CONFIG_N(n);
+               tmp |= AUD_CONFIG_N_PROG_ENABLE;
+       } else {
+               DRM_DEBUG_KMS("using automatic N\n");
        }
 
        I915_WRITE(HSW_AUD_CFG(pipe), tmp);