diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-27 18:11:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-27 18:11:52 -0700 |
| commit | c68f15ba4501e69b33718c74f034e973daef101c (patch) | |
| tree | 315b15dceb676bcba327aa3bba414f5c8cb848b1 /drivers/video/fbdev | |
| parent | 2859a4d70331ea24ec3adbb6c9cf954e76e20e2b (diff) | |
| parent | 0b85a93faed9e6a35675b5b4a110e42b579307fc (diff) | |
Merge "msm: mdss: do not apply AVMUTE for non-CTA format"
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_tx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index 8fa229aaa174..07592fa26a49 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -3211,8 +3211,7 @@ static int hdmi_tx_power_on(struct hdmi_tx_ctrl *hdmi_ctrl) hdmi_tx_core_on(hdmi_ctrl); - if (hdmi_ctrl->panel.infoframe && - !hdmi_tx_is_encryption_set(hdmi_ctrl) && + if (!hdmi_tx_is_encryption_set(hdmi_ctrl) && hdmi_tx_is_stream_shareable(hdmi_ctrl)) { hdmi_tx_config_avmute(hdmi_ctrl, false); } |