evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/video/fbdev/msm/mdss_hdmi_tx.c
View file

@ -415,13 +415,13 @@ static inline void hdmi_tx_send_audio_notification(
struct hdmi_tx_ctrl *hdmi_ctrl, int val) struct hdmi_tx_ctrl *hdmi_ctrl, int val)
{ {
if (hdmi_ctrl && hdmi_ctrl->ext_audio_data.intf_ops.hpd) { 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)) if (!hdmi_tx_is_dvi_mode(hdmi_ctrl))
flags |= MSM_EXT_DISP_HPD_AUDIO; flags |= MSM_EXT_DISP_HPD_AUDIO;
if (flags) if (flags)
hdmi_ctrl->ext_audio_data.intf_ops.hpd( hdmi_ctrl->ext_audio_data.intf_ops.hpd(
hdmi_ctrl->ext_pdev, hdmi_ctrl->ext_pdev,
hdmi_ctrl->ext_audio_data.type, val, flags); 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_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;
} }