Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d983946 authored by Ramalingam C's avatar Ramalingam C Committed by Sean Paul
Browse files

drm/i915: Reauthenticate HDCP on failure 



Incase of HDCP authentication failure, HDCP spec expects
reauthentication. Hence this patch adds the reauthentications
to be compliance with spec.

v2:
  do-while to for loop for simplicity. [Seanpaul]

v3:
  positioning the logs effectively. [Seanpaul]

Signed-off-by: default avatarRamalingam C <ramalingam.c@intel.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1517609350-10698-8-git-send-email-ramalingam.c@intel.com
parent 791a98dd

drivers/gpu/drm/i915/intel_hdcp.c

+11 −7
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector) 
static int _intel_hdcp_enable(struct intel_connector *connector)

{

	struct drm_i915_private *dev_priv = connector->base.dev->dev_private;

	int i, ret;

	int i, ret, tries = 3;



	DRM_DEBUG_KMS("[%s:%d] HDCP is being enabled...\n",

		      connector->base.name, connector->base.base.id);
@@ -596,17 +596,21 @@ static int _intel_hdcp_enable(struct intel_connector *connector) 
		return ret;

	}



	/* Incase of authentication failures, HDCP spec expects reauth. */

	for (i = 0; i < tries; i++) {

		ret = intel_hdcp_auth(conn_to_dig_port(connector),

				      connector->hdcp_shim);

	if (ret) {

		DRM_ERROR("Failed to authenticate HDCP (%d)\n", ret);

		if (!ret)

			return 0;



		DRM_DEBUG_KMS("HDCP Auth failure (%d)\n", ret);



		/* Ensuring HDCP encryption and signalling are stopped. */

		_intel_hdcp_disable(connector);

		return ret;

	}



	return 0;

	DRM_ERROR("HDCP authentication failed (%d tries/%d)\n", tries, ret);

	return ret;

}



static void intel_hdcp_check_work(struct work_struct *work)