drm/i915: Check has_infoframes when enabling infoframes

has_infoframe is what tells us whether infoframes should be enabled, so
let's pass that instead of has_hdmi_sink to .set_infoframes().

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170818134958.15502-3-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 4b4fd1f..07ced10 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -2150,7 +2150,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
 }
 
 static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
-                                     bool has_hdmi_sink,
+                                     bool has_infoframe,
                                      const struct intel_crtc_state *crtc_state,
                                      const struct drm_connector_state *conn_state,
                                      struct intel_shared_dpll *pll)
@@ -2177,7 +2177,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
                cnl_ddi_vswing_sequence(encoder, level);
 
        intel_hdmi->set_infoframes(drm_encoder,
-                                  has_hdmi_sink,
+                                  has_infoframe,
                                   crtc_state, conn_state);
 }
 
@@ -2197,7 +2197,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder,
        }
        if (type == INTEL_OUTPUT_HDMI) {
                intel_ddi_pre_enable_hdmi(encoder,
-                                         pipe_config->has_hdmi_sink,
+                                         pipe_config->has_infoframe,
                                          pipe_config, conn_state,
                                          pipe_config->shared_dpll);
        }

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index e8abea7..445b866 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1650,7 +1650,7 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder,
        intel_hdmi_prepare(encoder, pipe_config);
 
        intel_hdmi->set_infoframes(&encoder->base,
-                                  pipe_config->has_hdmi_sink,
+                                  pipe_config->has_infoframe,
                                   pipe_config, conn_state);
 }
 
@@ -1670,7 +1670,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder,
                                 0x2b247878);
 
        intel_hdmi->set_infoframes(&encoder->base,
-                                  pipe_config->has_hdmi_sink,
+                                  pipe_config->has_infoframe,
                                   pipe_config, conn_state);
 
        g4x_enable_hdmi(encoder, pipe_config, conn_state);
@@ -1742,7 +1742,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder,
        chv_set_phy_signal_level(encoder, 128, 102, false);
 
        intel_hdmi->set_infoframes(&encoder->base,
-                                  pipe_config->has_hdmi_sink,
+                                  pipe_config->has_infoframe,
                                   pipe_config, conn_state);
 
        g4x_enable_hdmi(encoder, pipe_config, conn_state);