[Intel-xe] [PATCH v6 1/3] Revert "FIXME: drm/i915: xe doesn't have gsc hdcp interface or something"

[Borah, Chaitanya Kumar]

> -----Original Message-----
> From: Kandpal, Suraj <suraj.kandpal at intel.com>
> Sent: Monday, October 16, 2023 2:32 PM
> To: intel-xe at lists.freedesktop.org
> Cc: Shankar, Uma <uma.shankar at intel.com>; Borah, Chaitanya Kumar
> <chaitanya.kumar.borah at intel.com>; Kandpal, Suraj
> <suraj.kandpal at intel.com>
> Subject: [PATCH v6 1/3] Revert "FIXME: drm/i915: xe doesn't have gsc hdcp
> interface or something"
> 
> This reverts commit 76d83e375beccee979a13284dc8a8079cc1ba020.
> 
> This is not needed anymore as required changes are done in i915 and the
> subsequent patches will make it possible to get everything to work without
> the stubs.
> Although we keep the i915_drv.h include as it is needed for buildability and
> needs to mirror intel_hdcp_gsc.c.
> 
> --v3
> -make a fixup patch [Jani]
> 
> --v5
> -make this a revert patch [Jani]
> 
> --v6
> -explain why i915_drv.h was included [Chaitanya]
> 
> Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>

LGTM

Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_hdcp.c     | 5 -----
>  drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 5 +++++
> drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 9 +++------
>  drivers/gpu/drm/xe/display/xe_hdcp_gsc.c      | 1 +
>  4 files changed, 9 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index ce9993c64459..8cca4793cf92 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -173,7 +173,6 @@ 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)) { -#ifdef I915
>  		struct intel_gt *gt = i915->media_gt;
>  		struct intel_gsc_uc *gsc = gt ? &gt->uc.gsc : NULL;
> 
> @@ -182,10 +181,6 @@ bool intel_hdcp2_capable(struct intel_connector
> *connector)
>  				    "GSC components required for HDCP2.2 are
> not ready\n");
>  			return false;
>  		}
> -#else
> -		/* TODO */
> -		return false;
> -#endif
>  	}
> 
>  	/* 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..d753db3eef15 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
> @@ -12,6 +12,11 @@
>  #include "i915_utils.h"
>  #include "intel_hdcp_gsc.h"
> 
> +bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915) {
> +	return DISPLAY_VER(i915) >= 14;
> +}
> +
>  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..cbf96551e534 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> @@ -8,7 +8,8 @@
> 
>  #include <linux/err.h>
>  #include <linux/types.h>
> -#include "i915_drv.h"
> +
> +struct drm_i915_private;
> 
>  struct intel_hdcp_gsc_message {
>  	struct i915_vma *vma;
> @@ -16,11 +17,7 @@ struct intel_hdcp_gsc_message {
>  	void *hdcp_cmd_out;
>  };
> 
> -static inline bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915)
> -{
> -	return DISPLAY_VER(i915) >= 14;
> -}
> -
> +bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915);
>  ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8
> *msg_in,
>  				size_t msg_in_len, u8 *msg_out,
>  				size_t msg_out_len);
> diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> index 5c02675bbb09..0453293af8ef 100644
> --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> @@ -3,6 +3,7 @@
>   * Copyright 2023, Intel Corporation.
>   */
> 
> +#include "i915_drv.h"
>  #include "intel_hdcp_gsc.h"
> 
>  int intel_hdcp_gsc_init(struct drm_i915_private *i915)
> --
> 2.25.1