Commit 6809f924 authored by Suraj Kandpal's avatar Suraj Kandpal Committed by Animesh Manna
Browse files

drm/i915/hdcp: Fix get remote hdcp capability function 



HDCP 1.x capability needs to be checked even if setup is not
HDCP 2.x capable.

--v2
-Assign hdcp_capable and hdcp2_capable to false [Chaitanya]

--v3
-Fix variable assignment [Chaitanya]

Fixes: 813cca96 ("drm/i915/hdcp: Add new remote capability check shim function")
Signed-off-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: default avatarAnimesh Manna <animesh.manna@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240401055652.276785-2-suraj.kandpal@intel.com
parent c2285a93

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

+4 −1
Original line number Diff line number Diff line
@@ -691,12 +691,15 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector, 
	u8 bcaps;

	int ret;



	*hdcp_capable = false;

	*hdcp2_capable = false;

	if (!intel_encoder_is_mst(connector->encoder))

		return -EINVAL;



	ret =  _intel_dp_hdcp2_get_capability(aux, hdcp2_capable);

	if (ret)

		return ret;

		drm_dbg_kms(&i915->drm,

			    "HDCP2 DPCD capability read failed err: %d\n", ret);



	ret = intel_dp_hdcp_read_bcaps(aux, i915, &bcaps);

	if (ret)