drm/i915: Check has_infoframes when enabling infoframes

[linux.git] / drivers / gpu / drm / i915 / intel_hdmi.c

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index e8abea7594ec4a5e333162cd1457a0b5f7cf6124..445b866818e45c9b0ab226f701ed2997023e751d 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);