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

!14813 drm/i915/hdcp: Add encoder check in intel_hdcp_get_capability 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhao Yipeng <zhaoyipeng5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DJ3Z4KZFM44I5K344655226X623GRMEW/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB5KR6 
 
Link:https://gitee.com/openeuler/kernel/pulls/14813

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 88ee450e b21f1b18

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

+6 −1
Original line number Diff line number Diff line
@@ -142,11 +142,16 @@ int intel_hdcp_read_valid_bksv(struct intel_digital_port *dig_port, 
/* Is HDCP1.4 capable on Platform and Sink */

bool intel_hdcp_capable(struct intel_connector *connector)

{

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);

	struct intel_digital_port *dig_port;

	const struct intel_hdcp_shim *shim = connector->hdcp.shim;

	bool capable = false;

	u8 bksv[5];



	if (!intel_attached_encoder(connector))

		return capable;



	dig_port = intel_attached_dig_port(connector);



	if (!shim)

		return capable;