Merge "msm: mdss: hdmi: modify audio event notification sequence."

This commit is contained in:
Linux Build Service Account 2018-03-15 05:43:02 -07:00 committed by Gerrit - the friendly Code Review server
commit 2d31100a1f

View file

@ -450,8 +450,6 @@ static inline void hdmi_tx_ack_state(
!hdmi_tx_is_dvi_mode(hdmi_ctrl)) !hdmi_tx_is_dvi_mode(hdmi_ctrl))
hdmi_ctrl->ext_audio_data.intf_ops.notify(hdmi_ctrl->ext_pdev, hdmi_ctrl->ext_audio_data.intf_ops.notify(hdmi_ctrl->ext_pdev,
val); val);
hdmi_tx_send_audio_notification(hdmi_ctrl, val);
} }
static struct hdmi_tx_ctrl *hdmi_tx_get_drvdata_from_panel_data( static struct hdmi_tx_ctrl *hdmi_tx_get_drvdata_from_panel_data(
@ -4045,6 +4043,7 @@ static int hdmi_tx_pre_evt_handle_update_fps(struct hdmi_tx_ctrl *hdmi_ctrl)
static int hdmi_tx_post_evt_handle_unblank(struct hdmi_tx_ctrl *hdmi_ctrl) static int hdmi_tx_post_evt_handle_unblank(struct hdmi_tx_ctrl *hdmi_ctrl)
{ {
hdmi_tx_ack_state(hdmi_ctrl, true); hdmi_tx_ack_state(hdmi_ctrl, true);
hdmi_tx_send_audio_notification(hdmi_ctrl, true);
return 0; return 0;
} }