Commit 5f6da193 authored by Suraj Kandpal's avatar Suraj Kandpal
Browse files

drm/i915/hdcp: Take force_hdcp14 into account during check_link 



During intel_hdcp_check_link phase we need to take into account
if we are currently forcing HDCP 1.4 or not. This is because
we check for HDCP 2.x Link first and only if HDCP 2.x is not being
used check for HDCP 1.4. With force_hdcp14 in picture we should not
be going into intel_hdcp2_check_link because of which we may end
up trying to disable HDCP2.x even if HDCP 1.4 was enabled causing
a lot of issues while IGT tests this.

Signed-off-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patch.msgid.link/20260225065045.3040787-1-suraj.kandpal@intel.com
parent 2344b93a

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

+1 −1
Original line number Diff line number Diff line
@@ -2231,7 +2231,7 @@ static void intel_hdcp_check_work(struct work_struct *work) 
	if (drm_connector_is_unregistered(&connector->base))

		return;



	if (!intel_hdcp2_check_link(connector))

	if (!hdcp->force_hdcp14 && !intel_hdcp2_check_link(connector))

		queue_delayed_work(display->wq.unordered, &hdcp->check_work,

				   DRM_HDCP2_CHECK_PERIOD_MS);

	else if (!intel_hdcp_check_link(connector))