Re: [Intel-xe] [PATCH 1/3] drm/i915/hdcp: Remove i915 check stubs

[Jani Nikula <jani.nikula@linux.intel.com>]

On Fri, 22 Sep 2023, Suraj Kandpal <suraj.kandpal@intel.com> wrote:
> Remove i915 check stubs the subsequent patch will add function
> which implements a cleaner method to share code between
> i915 and Xe

This should be a fixup! patch to whichever commit in drm-xe-next
introduced the changes.

See git commit --fixup to generate the annotation for that.

BR,
Jani.

>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_hdcp.c | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index f617ccd206c8..a42549fa9691 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -174,7 +174,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;
>  
> @@ -183,10 +182,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 */

-- 
Jani Nikula, Intel