Commit 7ac9f336 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-01-08' of... 

Merge tag 'drm-intel-fixes-2025-01-08' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link" [hdcp] (Suraj Kandpal)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z37BPchEzY0ovIqF@linux
parents 9d895519 77bf21a0

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

+9 −3
Original line number Diff line number Diff line
@@ -1158,9 +1158,15 @@ static int intel_hdcp_check_link(struct intel_connector *connector) 
		goto out;

	}



	ret = intel_hdcp1_enable(connector);

	if (ret) {

		drm_err(display->drm, "Failed to enable hdcp (%d)\n", ret);

		intel_hdcp_update_value(connector,

					DRM_MODE_CONTENT_PROTECTION_DESIRED,

					true);

		goto out;

	}



out:

	mutex_unlock(&dig_port->hdcp_mutex);

	mutex_unlock(&hdcp->mutex);