diff options
| author | Casey Piper <cpiper@codeaurora.org> | 2015-06-08 16:50:16 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:42:51 -0700 |
| commit | df4fbba73395e35b8d483d1b0cf677b44027e33a (patch) | |
| tree | dfc944e3dcbd3dfea755e8a5f028d76635e73518 | |
| parent | 29ab5f439baf8447042daad81db1cf51c02ca0a6 (diff) | |
msm: mdss: hdmi: remove check for hdcp ops when starting hdcp
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>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_tx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index 1867ea21e900..0ac5862d4f27 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -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; |