Skip to content

Commit 12bcd91

Browse files
surajk8rodrigovivi
authored andcommitted
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: 813cca9 ("drm/i915/hdcp: Add new remote capability check shim function") Signed-off-by: Suraj Kandpal <[email protected]> Reviewed-by: Chaitanya Kumar Borah <[email protected]> Signed-off-by: Animesh Manna <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 6809f92) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent 6154cc9 commit 12bcd91

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,12 +691,15 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector,
691691
u8 bcaps;
692692
int ret;
693693

694+
*hdcp_capable = false;
695+
*hdcp2_capable = false;
694696
if (!intel_encoder_is_mst(connector->encoder))
695697
return -EINVAL;
696698

697699
ret = _intel_dp_hdcp2_get_capability(aux, hdcp2_capable);
698700
if (ret)
699-
return ret;
701+
drm_dbg_kms(&i915->drm,
702+
"HDCP2 DPCD capability read failed err: %d\n", ret);
700703

701704
ret = intel_dp_hdcp_read_bcaps(aux, i915, &bcaps);
702705
if (ret)

0 commit comments

Comments
 (0)