diff options
| author | Narender Ankam <nankam@codeaurora.org> | 2019-07-10 12:58:44 +0530 |
|---|---|---|
| committer | Narender Ankam <nankam@codeaurora.org> | 2019-07-17 18:12:36 +0530 |
| commit | 446bafbde51aafee6c8afccdf9afff4a393ef47a (patch) | |
| tree | e6c39ac5de88ba5eeebbd90c9dc256a7a420b64a | |
| parent | 1b2ea6cc74925fbe5f79d97cbc5f315987b52d30 (diff) | |
msm: mdss: hdcp: handle hdcp off gracefully
As part of turning off HDCP, set HDCP status to
INACTIVE and cancel all pending works.
Change-Id: I38bcab2ec2ecbe7a825fe193d161073c4266fdc2
Signed-off-by: Narender Ankam <nankam@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_tx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index 4f30f7864bb0..0778e43fe0ff 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-2017, 2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -3742,7 +3742,8 @@ static int hdmi_tx_hdcp_off(struct hdmi_tx_ctrl *hdmi_ctrl) DEV_DBG("%s: Turning off HDCP\n", __func__); hdmi_ctrl->hdcp_ops->off(hdmi_ctrl->hdcp_data); - flush_delayed_work(&hdmi_ctrl->hdcp_cb_work); + hdmi_ctrl->hdcp_status = HDCP_STATE_INACTIVE; + cancel_delayed_work(&hdmi_ctrl->hdcp_cb_work); hdmi_ctrl->hdcp_ops = NULL; |