Commit ee0735ff authored by Juston Li's avatar Juston Li Committed by Anshuman Gupta
Browse files

drm/i915/hdcp: disable the QSES check for HDCP2.2 over MST 

Like the patch to disable QSES for HDCP 1.4 over MST
https://patchwork.freedesktop.org/patch/415297/

 the HDCP2.2 spec
doesn't require QSES as well and we've seen QSES not supported on a
couple HDCP2.2 docks so far (Dell WD19 and Lenovo LDC-G2)

Remove it for now until we get a better idea of how widely supported
QSES is and how to support it optionally.

Signed-off-by: default avatarJuston Li <juston.li@intel.com>
Reviewed-by: default avatarAnshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: default avatarAnshuman Gupta <anshuman.gupta@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210127065034.2501119-4-juston.li@intel.com
parent 5b6a9ba9

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

+1 −30
Original line number Diff line number Diff line
@@ -698,30 +698,6 @@ intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector, 
	return 0;

}



static bool intel_dp_mst_get_qses_status(struct intel_digital_port *dig_port,

					 struct intel_connector *connector)

{

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);

	struct drm_dp_query_stream_enc_status_ack_reply reply;

	struct intel_dp *intel_dp = &dig_port->dp;

	int ret;



	ret = drm_dp_send_query_stream_enc_status(&intel_dp->mst_mgr,

						  connector->port, &reply);

	if (ret) {

		drm_dbg_kms(&i915->drm,

			    "[%s:%d] failed QSES ret=%d\n",

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

		return false;

	}



	drm_dbg_kms(&i915->drm, "[%s:%d] QSES stream auth: %d stream enc: %d\n",

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

		    reply.auth_completed, reply.encryption_enabled);



	return reply.auth_completed && reply.encryption_enabled;

}



static int

intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector,

				     bool enable)
@@ -757,11 +733,6 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector, 
	return 0;

}



/*

 * DP v2.0 I.3.3 ignore the stream signature L' in QSES reply msg reply.

 * I.3.5 MST source device may use a QSES msg to query downstream status

 * for a particular stream.

 */

static

int intel_dp_mst_hdcp2_check_link(struct intel_digital_port *dig_port,

				  struct intel_connector *connector)
@@ -781,7 +752,7 @@ int intel_dp_mst_hdcp2_check_link(struct intel_digital_port *dig_port, 
			return ret;

	}



	return intel_dp_mst_get_qses_status(dig_port, connector) ? 0 : -EINVAL;

	return 0;

}



static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = {