Merge "msm: mdss: setup infoframe for all HDMI modes"

This commit is contained in:
Linux Build Service Account 2017-08-03 20:51:25 -07:00 committed by Gerrit - the friendly Code Review server
commit 77be18d0c9

View file

@ -272,20 +272,6 @@ static void hdmi_tx_cable_notify_work(struct work_struct *work)
mutex_unlock(&hdmi_ctrl->tx_lock);
} /* hdmi_tx_cable_notify_work */
static bool hdmi_tx_is_cea_format(int mode)
{
bool cea_fmt;
if ((mode > 0) && (mode <= HDMI_EVFRMT_END))
cea_fmt = true;
else
cea_fmt = false;
DEV_DBG("%s: %s\n", __func__, cea_fmt ? "Yes" : "No");
return cea_fmt;
}
static inline bool hdmi_tx_is_hdcp_enabled(struct hdmi_tx_ctrl *hdmi_ctrl)
{
return hdmi_ctrl->hdcp_feature_on &&
@ -3192,9 +3178,7 @@ static int hdmi_tx_power_on(struct hdmi_tx_ctrl *hdmi_ctrl)
}
hdmi_ctrl->panel.vic = hdmi_ctrl->vic;
if (!hdmi_tx_is_dvi_mode(hdmi_ctrl) &&
hdmi_tx_is_cea_format(hdmi_ctrl->vic))
if (!hdmi_tx_is_dvi_mode(hdmi_ctrl))
hdmi_ctrl->panel.infoframe = true;
else
hdmi_ctrl->panel.infoframe = false;