Unverified Commit c7c32544 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14853 drm/i915/hdcp: Add encoder check in hdcp2_get_capability 

Merge Pull Request from: @ci-robot 
 
PR sync from: He Yujie <coka.heyujie@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WX3WA72ZRNLWS3BW5QZNUKIK4MQMSN4A/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB5KQZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/14853

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents fbbdb703 a72a96e7

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

+6 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ bool intel_hdcp_capable(struct intel_connector *connector) 
/* Is HDCP2.2 capable on Platform and Sink */

bool intel_hdcp2_capable(struct intel_connector *connector)

{

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);

	struct intel_digital_port *dig_port;

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);

	struct intel_hdcp *hdcp = &connector->hdcp;

	bool capable = false;
@@ -103,6 +103,11 @@ bool intel_hdcp2_capable(struct intel_connector *connector) 
	}

	mutex_unlock(&dev_priv->hdcp_comp_mutex);



	if (!intel_attached_encoder(connector))

		return false;



	dig_port = intel_attached_dig_port(connector);



	/* Sink's capability for HDCP2.2 */

	hdcp->shim->hdcp_2_2_capable(dig_port, &capable);