aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamalingam C <ramalingam.c@intel.com>2018-01-18 00:48:07 -0500
committerSean Paul <seanpaul@chromium.org>2018-01-18 17:55:26 -0500
commit24b42cbadb73e0b9ac67c2d619073b394bc146bd (patch)
tree056806819a11c51889f6d193420c061b79746393
parent87eb3ec818fa57bc49ce419785c56d72d9da1faa (diff)
drm/i915: Start repeater auth on READY/CP_IRQ
Second stage of HDCP authentication starts at CP_IRQ or at the assertion of READY bit from Repeater. Till then repeater will be authenticating with its downstream devices. So authenticated device count, depth and ksv_list readable from repeaters are valid only after assertion of READY/CP_IRQ. This patch makes sure that READY is polled before reading any topology information. Signed-off-by: Ramalingam C <ramalingam.c@intel.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/1516254488-4971-4-git-send-email-ramalingam.c@intel.com
-rw-r--r--drivers/gpu/drm/i915/intel_hdcp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index c8e611af408e..b50c03a3bfe6 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -150,6 +150,12 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,
150 150
151 dev_priv = intel_dig_port->base.base.dev->dev_private; 151 dev_priv = intel_dig_port->base.base.dev->dev_private;
152 152
153 ret = intel_hdcp_poll_ksv_fifo(intel_dig_port, shim);
154 if (ret) {
155 DRM_ERROR("KSV list failed to become ready (%d)\n", ret);
156 return ret;
157 }
158
153 ret = shim->read_bstatus(intel_dig_port, bstatus); 159 ret = shim->read_bstatus(intel_dig_port, bstatus);
154 if (ret) 160 if (ret)
155 return ret; 161 return ret;
@@ -161,12 +167,6 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,
161 return 0; 167 return 0;
162 } 168 }
163 169
164 ret = intel_hdcp_poll_ksv_fifo(intel_dig_port, shim);
165 if (ret) {
166 DRM_ERROR("KSV list failed to become ready (%d)\n", ret);
167 return ret;
168 }
169
170 ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL); 170 ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL);
171 if (!ksv_fifo) 171 if (!ksv_fifo)
172 return -ENOMEM; 172 return -ENOMEM;