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

Merge "msm: mdss: hdcp: handle hdcp off gracefully"

Browse source
This commit is contained in:
Linux Build Service Account 2019-08-08 09:34:47 -07:00 • committed by Gerrit - the friendly Code Review server
commit 982ba8be16
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;