> -----Original Message-----
> From: Kandpal, Suraj <suraj.kandpal@xxxxxxxxx>
> Sent: Monday, April 1, 2024 11:27 AM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@xxxxxxxxx>; Kandpal,
> Suraj <suraj.kandpal@xxxxxxxxx>
> Subject: [PATCH 2/2] 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: 813cca96e4ac ("drm/i915/hdcp: Add new remote capability check shim
> function")
> Signed-off-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx>
LGTM
Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> index 179e754e5c30..92b03073acdd 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> @@ -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)
> --
> 2.43.2
