Commit 12bcd910 authored by Suraj Kandpal's avatar Suraj Kandpal Committed by Rodrigo Vivi

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
(cherry picked from commit 6809f924)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 6154cc91
...@@ -691,12 +691,15 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector, ...@@ -691,12 +691,15 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector,
u8 bcaps; u8 bcaps;
int ret; int ret;
*hdcp_capable = false;
*hdcp2_capable = false;
if (!intel_encoder_is_mst(connector->encoder)) if (!intel_encoder_is_mst(connector->encoder))
return -EINVAL; return -EINVAL;
ret = _intel_dp_hdcp2_get_capability(aux, hdcp2_capable); ret = _intel_dp_hdcp2_get_capability(aux, hdcp2_capable);
if (ret) 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); ret = intel_dp_hdcp_read_bcaps(aux, i915, &bcaps);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment