Commit dbda9580 authored Aug 05, 2020 by Anshuman Gupta Committed by Ramalingam C Aug 26, 2020

drm/i915/hdcp: Add update_pipe early return



Currently intel_hdcp_update_pipe() is also getting called for non-hdcp
connectors and get through its conditional code flow, which is completely
unnecessary for non-hdcp connectors, therefore it make sense to
have an early return. No functional change.

v2:
- rebased.

Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200805114521.867-2-anshuman.gupta@intel.com

parent ced026e9

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -2082,11 +2082,15 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
		struct intel_connector *connector =
		to_intel_connector(conn_state->connector);
		struct intel_hdcp *hdcp = &connector->hdcp;
		bool content_protection_type_changed =
		bool content_protection_type_changed, desired_and_not_enabled = false;

		if (!connector->hdcp.shim)
		return;

		content_protection_type_changed =
		(conn_state->hdcp_content_type != hdcp->content_type &&
		conn_state->content_protection !=
		DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
		bool desired_and_not_enabled = false;

		/*
		* During the HDCP encryption session if Type change is requested,

Admin message