[Intel-xe] [PATCH v4 2/3] drm/i915/hdcp: Move checks for gsc health status

[Kandpal, Suraj]

> -----Original Message-----
> From: Jani Nikula <jani.nikula at linux.intel.com>
> Sent: Thursday, October 12, 2023 4:02 PM
> To: Kandpal, Suraj <suraj.kandpal at intel.com>; intel-xe at lists.freedesktop.org
> Cc: Shankar, Uma <uma.shankar at intel.com>; Kandpal, Suraj
> <suraj.kandpal at intel.com>
> Subject: Re: [PATCH v4 2/3] drm/i915/hdcp: Move checks for gsc health status
> 
> On Thu, 12 Oct 2023, Suraj Kandpal <suraj.kandpal at intel.com> wrote:
> > Move checks for gsc components required for HDCP 2.2 to work into
> > intel_hdcp_gsc.c. This will also help with XE refactor on HDCP's side.
> >
> > Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>
> > Reviewed-by: Uma Shankar <uma.shankar at intel.com>
> > Signed-off-by: Uma Shankar <uma.shankar at intel.com>
> > Link:
> > https://patchwork.freedesktop.org/patch/msgid/20231009095537.653619-2-
> > suraj.kandpal at intel.com
> 
> Backports of upstream commits *MUST* have the cherry-pick annotation.
> Otherwise this'll just pop up as another commit that needs to be fixed before
> we merge upstream.
> 
> You'll get it with 'git cherry-pick -x'.
> 

Ohkay wasn't aware of this will get this sorted and send out the revision

Regards,
Suraj Kandpal

> 
> BR,
> Jani.
> 
> 
> > ---
> >  drivers/gpu/drm/i915/display/intel_hdcp.c     |  8 +-------
> >  drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 14 ++++++++++++++
> > drivers/gpu/drm/i915/display/intel_hdcp_gsc.h |  1 +
> >  3 files changed, 16 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > index 8cca4793cf92..c89da3568ebd 100644
> > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > @@ -173,14 +173,8 @@ bool intel_hdcp2_capable(struct intel_connector
> > *connector)
> >
> >  	/* If MTL+ make sure gsc is loaded and proxy is setup */
> >  	if (intel_hdcp_gsc_cs_required(i915)) {
> > -		struct intel_gt *gt = i915->media_gt;
> > -		struct intel_gsc_uc *gsc = gt ? &gt->uc.gsc : NULL;
> > -
> > -		if (!gsc || !intel_uc_fw_is_running(&gsc->fw)) {
> > -			drm_dbg_kms(&i915->drm,
> > -				    "GSC components required for HDCP2.2 are
> not ready\n");
> > +		if (!intel_hdcp_gsc_check_status(i915))
> >  			return false;
> > -		}
> >  	}
> >
> >  	/* MEI/GSC interface is solid depending on which is used */ diff
> > --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
> > b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
> > index 4ab640b4e7ec..69af416cffe6 100644
> > --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
> > +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
> > @@ -12,6 +12,20 @@
> >  #include "i915_utils.h"
> >  #include "intel_hdcp_gsc.h"
> >
> > +bool intel_hdcp_gsc_check_status(struct drm_i915_private *i915) {
> > +	struct intel_gt *gt = i915->media_gt;
> > +	struct intel_gsc_uc *gsc = gt ? &gt->uc.gsc : NULL;
> > +
> > +	if (!gsc || !intel_uc_fw_is_running(&gsc->fw)) {
> > +		drm_dbg_kms(&i915->drm,
> > +			    "GSC components required for HDCP2.2 are not
> ready\n");
> > +		return false;
> > +	}
> > +
> > +	return true;
> > +}
> > +
> >  static int
> >  gsc_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
> >  			  struct hdcp2_ake_init *ake_data) diff --git
> > a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> > b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> > index 704acd3ed46b..dcbf9b0b22c6 100644
> > --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> > +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> > @@ -26,5 +26,6 @@ ssize_t intel_hdcp_gsc_msg_send(struct
> drm_i915_private *i915, u8 *msg_in,
> >  				size_t msg_out_len);
> >  int intel_hdcp_gsc_init(struct drm_i915_private *i915);  void
> > intel_hdcp_gsc_fini(struct drm_i915_private *i915);
> > +bool intel_hdcp_gsc_check_status(struct drm_i915_private *i915);
> >
> >  #endif /* __INTEL_HDCP_GCS_H__ */
> 
> --
> Jani Nikula, Intel