[Intel-gfx] [PATCH 3/3] drm/i915/hdcp: Add more conditions to enable hdcp

[Nautiyal, Ankit K]

On 10/26/2023 5:41 PM, Suraj Kandpal wrote:
> When we dock a monitor we end up with a enable and disable connector
> cycle but if hdcp content is running we get the userspace in

I was wondering if there should have been a uevent sent when driver 
changes the state from enabled to undesired,

but as per documentation we send the uevent only from enabled->desired 
or desired->enabled.

Anyway, this change looks good to me.

> enabled state and driver maintaining a undesired state which causes
> the content to stop playing and we only enabe hdcp if the userspace

Nitpick : enable

> state in desired. This patch fixes that.
>
> --v2
> -Move code to intel_hdcp [Jani]
>
> Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>


Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>

> ---
>   drivers/gpu/drm/i915/display/intel_hdcp.c | 14 ++++++++++++--
>   1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 44c0a93f3af8..39b3f7c0c77c 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -2409,9 +2409,19 @@ void intel_hdcp_enable(struct intel_atomic_state *state,
>   		       const struct intel_crtc_state *crtc_state,
>   		       const struct drm_connector_state *conn_state)
>   {
> -	/* Enable hdcp if it's desired */
> +	struct intel_connector *connector =
> +		to_intel_connector(conn_state->connector);
> +	struct intel_hdcp *hdcp = &connector->hdcp;
> +
> +	/*
> +	 * Enable hdcp if it's desired or if userspace is enabled and
> +	 * driver set its state to undesired
> +	 */
>   	if (conn_state->content_protection ==
> -	    DRM_MODE_CONTENT_PROTECTION_DESIRED)
> +	    DRM_MODE_CONTENT_PROTECTION_DESIRED ||
> +	    (conn_state->content_protection ==
> +	    DRM_MODE_CONTENT_PROTECTION_ENABLED && hdcp->value ==
> +	    DRM_MODE_CONTENT_PROTECTION_UNDESIRED))
>   		_intel_hdcp_enable(state, encoder, crtc_state, conn_state);
>   }
>