Skip to content

Commit fcf73e2

Browse files
committed
Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link"
This reverts commit 483f7d9. This needs to be reverted since HDCP even after updating the connector state HDCP property we don't reenable HDCP until the next commit in which the CP Property is set causing compliance to fail. --v2 -Fix build issue [Dnyaneshwar] Signed-off-by: Suraj Kandpal <[email protected]> Reviewed-by: Dnyaneshwar Bhadane <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 60a43ec commit fcf73e2

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,9 +1166,15 @@ static int intel_hdcp_check_link(struct intel_connector *connector)
11661166
goto out;
11671167
}
11681168

1169-
intel_hdcp_update_value(connector,
1170-
DRM_MODE_CONTENT_PROTECTION_DESIRED,
1171-
true);
1169+
ret = intel_hdcp1_enable(connector);
1170+
if (ret) {
1171+
drm_err(display->drm, "Failed to enable hdcp (%d)\n", ret);
1172+
intel_hdcp_update_value(connector,
1173+
DRM_MODE_CONTENT_PROTECTION_DESIRED,
1174+
true);
1175+
goto out;
1176+
}
1177+
11721178
out:
11731179
mutex_unlock(&dig_port->hdcp_mutex);
11741180
mutex_unlock(&hdcp->mutex);

0 commit comments

Comments
 (0)