> -----Original Message-----
> From: Intel-xe <intel-xe-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Suraj
> Kandpal
> Sent: Friday, December 20, 2024 10:32 AM
> To: intel-xe@xxxxxxxxxxxxxxxxxxxxx; intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Nautiyal, Ankit K <ankit.k.nautiyal@xxxxxxxxx>; Kandpal, Suraj
> <suraj.kandpal@xxxxxxxxx>
> Subject: [PATCH] Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from
> check_link"
>
> This reverts commit 483f7d94a0453564ad9295288c0242136c5f36a0.
> This needs to be reverted since HDCP even after updating the connector state
> HDCP property we don't reenable HDCP until the next commit in which the CP
> Property is set causing compliance to fail.
>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index f6e68a0e3b6d..33c705b5ee28 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -1166,9 +1166,15 @@ static int intel_hdcp_check_link(struct
> intel_connector *connector)
> goto out;
> }
>
> - intel_hdcp_update_value(connector,
> -
> DRM_MODE_CONTENT_PROTECTION_DESIRED,
> - true);
> + ret = intel_hdcp1_enable(connector);
> + if (ret) {
> + drm_err(&i915->drm, "Failed to enable hdcp (%d)\n", ret);
> + intel_hdcp_update_value(connector,
> +
> DRM_MODE_CONTENT_PROTECTION_DESIRED,
> + true);
Hi Suraj,
The latest drm-tip no longer use &i915->drm.
Please use the intel_display structure instead.
Regards,
Dnyaneshwar
> + goto out;
> + }
> +
> out:
> mutex_unlock(&dig_port->hdcp_mutex);
> mutex_unlock(&hdcp->mutex);
> --
> 2.34.1
