Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 11:53:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge "msm: mdss: hdmi: return cable status only when HDMI is powered"

Browse source
This commit is contained in:
Linux Build Service Account 2015-06-15 06:39:20 -07:00 committed by Gerrit - the friendly Code Review server
parent 1e37bca08e 7142fd38de
commit 6d1276acf1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/video/msm/mdss/mdss_hdmi_tx.c
View file

@ -2901,7 +2901,7 @@ static int hdmi_tx_get_cable_status(struct platform_device *pdev, u32 vote)
}
spin_lock_irqsave(&hdmi_ctrl->hpd_state_lock, flags);
hpd = hdmi_ctrl->hpd_state;
hpd = hdmi_ctrl->hpd_state && hdmi_ctrl->panel_power_on;
spin_unlock_irqrestore(&hdmi_ctrl->hpd_state_lock, flags);
hdmi_ctrl->vote_hdmi_core_on = false;
@ -3195,10 +3195,6 @@ static int hdmi_tx_power_on(struct mdss_panel_data *panel_data)
return rc;
}
mutex_lock(&hdmi_ctrl->power_mutex);
hdmi_ctrl->panel_power_on = true;
mutex_unlock(&hdmi_ctrl->power_mutex);
if (hdmi_ctrl->hpd_state) {
rc = hdmi_tx_start(hdmi_ctrl);
if (rc) {
@ -3208,6 +3204,10 @@ static int hdmi_tx_power_on(struct mdss_panel_data *panel_data)
return rc;
}
}
mutex_lock(&hdmi_ctrl->power_mutex);
hdmi_ctrl->panel_power_on = true;
mutex_unlock(&hdmi_ctrl->power_mutex);
end:
dss_reg_dump(io->base, io->len, "HDMI-ON: ", REG_DUMP);