[PATCH] Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link"

[Rodrigo Vivi]

On Fri, Jan 03, 2025 at 12:38:43PM +0000, Bhadane, Dnyaneshwar wrote:
> 
> 
> > -----Original Message-----
> > From: Kandpal, Suraj <suraj.kandpal at intel.com>
> > Sent: Friday, January 3, 2025 2:15 PM
> > To: intel-xe at lists.freedesktop.org; intel-gfx at lists.freedesktop.org
> > Cc: Bhadane, Dnyaneshwar <dnyaneshwar.bhadane at intel.com>; Kandpal,
> > Suraj <suraj.kandpal at intel.com>
> > 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.
> > 
> > --v2
> > -Fix build issue [Dnyaneshwar]
> > 
> > Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>
> 
> LGTM,  
> Thank you.
> Reviewed-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane at intel.com>

I'm afraid this patch missed the Fixes and cc stable tags.

Tvrtko, could you please take this to drm-intel-fixes?

Suraj, once this patch hits Linus master branch, could you please
send it to stable ml?

Thanks,
Rodrigo.

> > ---
> >  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..7464b44c8bb3 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(display->drm, "Failed to enable hdcp (%d)\n", ret);
> > +		intel_hdcp_update_value(connector,
> > +
> > 	DRM_MODE_CONTENT_PROTECTION_DESIRED,
> > +					true);
> > +		goto out;
> > +	}
> > +
> >  out:
> >  	mutex_unlock(&dig_port->hdcp_mutex);
> >  	mutex_unlock(&hdcp->mutex);
> > --
> > 2.34.1
>