Skip to content

Commit 4480604

Browse files
surajk8rodrigovivi
authored andcommitted
drm/i915/hdcp: Fix Repeater authentication during topology change
When topology changes, before beginning a new HDCP authentication by sending AKE_init message we need to first authenticate only the repeater. Only after repeater authentication failure, it makes sense to start a new HDCP authentication. Even though it made sense to not enable HDCP directly from check_link and schedule it for later, repeater authentication needs to be done immediately. --v2 -Fix comment grammatical errors [Ankit] Fixes: 47ef55a ("drm/i915/hdcp: Don't enable HDCP2.2 directly from check_link") Signed-off-by: Suraj Kandpal <[email protected]> Reviewed-by: Ankit Nautiyal <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 605a33e) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent 2014c95 commit 4480604

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

drivers/gpu/drm/i915/display/intel_hdcp.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2188,6 +2188,19 @@ static int intel_hdcp2_check_link(struct intel_connector *connector)
21882188

21892189
drm_dbg_kms(display->drm,
21902190
"HDCP2.2 Downstream topology change\n");
2191+
2192+
ret = hdcp2_authenticate_repeater_topology(connector);
2193+
if (!ret) {
2194+
intel_hdcp_update_value(connector,
2195+
DRM_MODE_CONTENT_PROTECTION_ENABLED,
2196+
true);
2197+
goto out;
2198+
}
2199+
2200+
drm_dbg_kms(display->drm,
2201+
"[CONNECTOR:%d:%s] Repeater topology auth failed.(%d)\n",
2202+
connector->base.base.id, connector->base.name,
2203+
ret);
21912204
} else {
21922205
drm_dbg_kms(display->drm,
21932206
"[CONNECTOR:%d:%s] HDCP2.2 link failed, retrying auth\n",

0 commit comments

Comments
 (0)