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

msm: mdss: hdmi: remove check for hdcp ops when starting hdcp

Browse source 
Checking if HDCP is enabled will ensure that HDCP 2.2
is enabled, in which case hdcp ops will be available.
Removing redundant check for hdcp ops. This prevents an
error log when EINVAL is unnecessarily returned to
mdp_intf.

Change-Id: I3f63dbd70651b15b241df9f3ebd4c1aab231fced
Signed-off-by: Casey Piper <cpiper@codeaurora.org>
This commit is contained in:
Casey Piper 2015-06-08 16:50:16 -07:00 • committed by David Keitel
parent 29ab5f439b
commit df4fbba733
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1382,6 +1382,8 @@ static void hdmi_tx_hpd_int_work(struct work_struct *work)
if (hdmi_ctrl->hdcp_ops)
hdmi_ctrl->hdcp22_present = true;
else
hdmi_ctrl->hdcp22_present = false;
if (!hdmi_ctrl->hdcp22_present && hdmi_ctrl->hdcp14_present) {
hdmi_ctrl->hdcp_feature_data =
@ -3646,11 +3648,6 @@ static int hdmi_tx_start_hdcp(struct hdmi_tx_ctrl *hdmi_ctrl)
return -EINVAL;
}
if (!hdmi_ctrl->hdcp_ops) {
DEV_ERR("%s: HDCP feature is not available\n", __func__);
return -ENODEV;
}
if (hdmi_ctrl->panel_data.panel_info.cont_splash_enabled ||
!hdmi_tx_is_hdcp_enabled(hdmi_ctrl))
return 0;