Commit dfe4cbc2 authored by Ramalingam C's avatar Ramalingam C Committed by Daniel Vetter
Browse files

drm/i915: Handle HDCP2.2 downstream topology change 



When repeater notifies a downstream topology change, this patch
reauthenticate the repeater alone without disabling the hdcp
encryption. If that fails then complete reauthentication is executed.

v2:
  Rebased.
v3:
  Typo in commit msg is fixed [Uma]
v4:
  Rebased as part of patch reordering.
  Minor style fixes.
v5:
  Rebased.
v6:
  Rebased.
v7:
  Errors due to sinks are reported as DEBUG logs.

Signed-off-by: default avatarRamalingam C <ramalingam.c@intel.com>
Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/1550338640-17470-12-git-send-email-ramalingam.c@intel.com
parent 22ce2d94

drivers/gpu/drm/i915/intel_hdcp.c

+18 −2
Original line number Diff line number Diff line
@@ -1626,8 +1626,24 @@ static int intel_hdcp2_check_link(struct intel_connector *connector) 
		goto out;

	}



	if (ret == HDCP_TOPOLOGY_CHANGE) {

		if (hdcp->value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)

			goto out;



		DRM_DEBUG_KMS("HDCP2.2 Downstream topology change\n");

		ret = hdcp2_authenticate_repeater_topology(connector);

		if (!ret) {

			hdcp->value = DRM_MODE_CONTENT_PROTECTION_ENABLED;

			schedule_work(&hdcp->prop_work);

			goto out;

		}

		DRM_DEBUG_KMS("[%s:%d] Repeater topology auth failed.(%d)\n",

			      connector->base.name, connector->base.base.id,

			      ret);

	} else {

		DRM_DEBUG_KMS("[%s:%d] HDCP2.2 link failed, retrying auth\n",

			      connector->base.name, connector->base.base.id);

	}



	ret = _intel_hdcp2_disable(connector);

	if (ret) {