summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-03-15 05:43:11 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-15 05:43:10 -0700
commit50cff2fe5a08443fb7c96ce5c7c2a37e4a7e0d36 (patch)
tree14e20e5fd35bcf615c1081c2c8a151a8427350d1 /drivers/video/fbdev
parente13997c3913eb5d1e51e1e021ea9cbf4061b8733 (diff)
parent251d5d7b3e9fa246ce77c424b37ec3363b7d6c28 (diff)
Merge " msm: mdss: hdcp_1x: enable HDP irq only for DP client"
Diffstat (limited to 'drivers/video/fbdev')
-rw-r--r--drivers/video/fbdev/msm/mdss_hdcp_1x.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdcp_1x.c b/drivers/video/fbdev/msm/mdss_hdcp_1x.c
index 169b474225bd..8df9080129b9 100644
--- a/drivers/video/fbdev/msm/mdss_hdcp_1x.c
+++ b/drivers/video/fbdev/msm/mdss_hdcp_1x.c
@@ -894,9 +894,13 @@ static void hdcp_1x_enable_sink_irq_hpd(struct hdcp_1x *hdcp)
{
int rc;
u8 enable_hpd_irq = 0x1;
- u16 version = *hdcp->init_data.version;
+ u16 version;
const int major = 1, minor = 2;
+ if (hdcp->init_data.client_id == HDCP_CLIENT_HDMI)
+ return;
+
+ version = *hdcp->init_data.version;
pr_debug("version 0x%x\n", version);
if (((version & 0xFF) < minor) ||