diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-15 05:43:02 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-15 05:43:01 -0700 |
| commit | 2d31100a1f67d3987b1ec10d4c6c4895da229db6 (patch) | |
| tree | 86d355db456bde9bf7cb75b4e480ec677fdaaa03 | |
| parent | e0cfc874215984926e3c0c1483ea9cefb89f1ae5 (diff) | |
| parent | a5e82de8cdd74bf8b3586f092a855b0e090859c3 (diff) | |
Merge "msm: mdss: hdmi: modify audio event notification sequence."
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_tx.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index 5cb436261115..cfd61ce47cfc 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -415,13 +415,13 @@ static inline void hdmi_tx_send_audio_notification( struct hdmi_tx_ctrl *hdmi_ctrl, int val) { if (hdmi_ctrl && hdmi_ctrl->ext_audio_data.intf_ops.hpd) { - u32 flags = 0; + u32 flags = 0; - if (!hdmi_tx_is_dvi_mode(hdmi_ctrl)) - flags |= MSM_EXT_DISP_HPD_AUDIO; + if (!hdmi_tx_is_dvi_mode(hdmi_ctrl)) + flags |= MSM_EXT_DISP_HPD_AUDIO; - if (flags) - hdmi_ctrl->ext_audio_data.intf_ops.hpd( + if (flags) + hdmi_ctrl->ext_audio_data.intf_ops.hpd( hdmi_ctrl->ext_pdev, hdmi_ctrl->ext_audio_data.type, val, flags); } @@ -450,8 +450,6 @@ static inline void hdmi_tx_ack_state( !hdmi_tx_is_dvi_mode(hdmi_ctrl)) hdmi_ctrl->ext_audio_data.intf_ops.notify(hdmi_ctrl->ext_pdev, val); - - hdmi_tx_send_audio_notification(hdmi_ctrl, val); } 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) { hdmi_tx_ack_state(hdmi_ctrl, true); + hdmi_tx_send_audio_notification(hdmi_ctrl, true); return 0; } |