diff options
| author | Ajay Singh Parmar <aparmar@codeaurora.org> | 2014-07-29 15:24:57 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:32:51 -0700 |
| commit | 3f6d6aba4051f1cd52283ecfd625c571a3d1eb87 (patch) | |
| tree | c4f0700f670022c0bd92335afa92efd2df7ec05b | |
| parent | aecb49dd9b6cd791810c41c30c586c701e32c3b9 (diff) | |
msm: mdss: hdmi: do not timeout on hdcp re-authentication
Keep re-authenticating until successful as sinks may choose
not to issue HPD while switching HDMI ports or powering on/off
which usually trigger HDCP on/off.
Change-Id: Ib4b13592df8753df1693c6279f04fc963ba9974f
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_hdcp.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c b/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c index e243234348f9..0fc1f240f035 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c @@ -1218,36 +1218,6 @@ int hdmi_hdcp_authenticate(void *input) return 0; } /* hdmi_hdcp_authenticate */ -/* - * Only retries defined times then abort current authenticating process - * Send check_topology message to notify any hdcpmanager's client of non- - * hdcp authenticated data link so the client can tear down any active secure - * playback. - * Reduce hdcp link to regular hdmi data link with hdcp disabled so any - * un-secure like UI & menu still can be sent over HDMI and display. - */ -#define AUTH_RETRIES_TIME (30) -static int hdmi_msm_if_abort_reauth(struct hdmi_hdcp_ctrl *hdcp_ctrl) -{ - int ret = 0; - - if (!hdcp_ctrl) { - DEV_ERR("%s: invalid input\n", __func__); - return -EINVAL; - } - - if (++hdcp_ctrl->auth_retries == AUTH_RETRIES_TIME) { - mutex_lock(hdcp_ctrl->init_data.mutex); - hdcp_ctrl->hdcp_state = HDCP_STATE_INACTIVE; - mutex_unlock(hdcp_ctrl->init_data.mutex); - - hdcp_ctrl->auth_retries = 0; - ret = -ERANGE; - } - - return ret; -} - int hdmi_hdcp_reauthenticate(void *input) { struct hdmi_hdcp_ctrl *hdcp_ctrl = (struct hdmi_hdcp_ctrl *)input; @@ -1292,13 +1262,6 @@ int hdmi_hdcp_reauthenticate(void *input) DSS_REG_R(hdcp_ctrl->init_data.core_io, HDMI_HPD_CTRL) | BIT(28)); - ret = hdmi_msm_if_abort_reauth(hdcp_ctrl); - - if (ret) { - DEV_ERR("%s: abort reauthentication!\n", __func__); - return ret; - } - /* Restart authentication attempt */ DEV_DBG("%s: %s: Scheduling work to start HDCP authentication", __func__, HDCP_STATE_NAME); |