[PATCH 5/5] drm/xe/hdcp: Add intel_hdcp_gsc_message to Makefile

Kandpal, Suraj suraj.kandpal at intel.com
Mon Feb 19 05:09:46 UTC 2024


> 
> Hey,
> 
> Where is xe_hdcp_gsc_message.c defined in this series?
> 
> I would move this part there.
> 

Hi Maarten
So there is no xe_hdcp_gsc_message.c but just intel_hdcp_gsc_message.c which\
Was separated from intel_hdcp_gsc.c for the purpose of code sharing and this
Patch just build the intel_hdcp_gsc_message.c here.
Also as I mentioned in comments of patch 4 I separated this here just for review purposes.
And will squash this patch with last one before getting this merged.

> On 2024-02-09 11:14, Suraj Kandpal wrote:
> > Add intel_hdcp_gsc_message to Makefile and add corresponding changes
> > to xe_hdcp_gsc.c to make it build.
> >
> > Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>
> > ---
> >   drivers/gpu/drm/xe/Makefile              |  1 +
> >   drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 18 ++++++++++++++++++
> >   2 files changed, 19 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
> > index c531210695db..2b654c908ff3 100644
> > --- a/drivers/gpu/drm/xe/Makefile
> > +++ b/drivers/gpu/drm/xe/Makefile
> > @@ -254,6 +254,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
> >   	i915-display/intel_global_state.o \
> >   	i915-display/intel_gmbus.o \
> >   	i915-display/intel_hdcp.o \
> > +	i915-display/intel_hdcp_gsc_message.o \
> >   	i915-display/intel_hdmi.o \
> >   	i915-display/intel_hotplug.o \
> >   	i915-display/intel_hotplug_irq.o \
> > diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > index aa8c13916bb6..f185465d5682 100644
> > --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > @@ -5,9 +5,11 @@
> >
> >   #include <drm/drm_print.h>
> >   #include <linux/delay.h>
> > +#include <drm/i915_hdcp_interface.h>
> >
> >   #include "abi/gsc_command_header_abi.h"
> >   #include "intel_hdcp_gsc.h"
> > +#include "intel_hdcp_gsc_message.h"
> >   #include "xe_device_types.h"
> >   #include "xe_gt.h"
> >   #include "xe_gsc_proxy.h"
> > @@ -113,6 +115,22 @@ static int intel_hdcp_gsc_hdcp2_init(struct
> xe_device *xe)
> >   	return ret;
> >   }
> >
> > +static const struct i915_hdcp_ops gsc_hdcp_ops = {
> > +	.initiate_hdcp2_session = intel_hdcp_gsc_initiate_session,
> > +	.verify_receiver_cert_prepare_km =
> > +
> 	intel_hdcp_gsc_verify_receiver_cert_prepare_km,
> > +	.verify_hprime = intel_hdcp_gsc_verify_hprime,
> > +	.store_pairing_info = intel_hdcp_gsc_store_pairing_info,
> > +	.initiate_locality_check = intel_hdcp_gsc_initiate_locality_check,
> > +	.verify_lprime = intel_hdcp_gsc_verify_lprime,
> > +	.get_session_key = intel_hdcp_gsc_get_session_key,
> > +	.repeater_check_flow_prepare_ack =
> > +
> 	intel_hdcp_gsc_repeater_check_flow_prepare_ack,
> > +	.verify_mprime = intel_hdcp_gsc_verify_mprime,
> > +	.enable_hdcp_authentication =
> intel_hdcp_gsc_enable_authentication,
> > +	.close_hdcp_session = intel_hdcp_gsc_close_session, };
> The changes to xe_hdcp_gsc seems like it should be part of the previous
> commit?
> 
> Presumably also useful to reorder the Makefile change to before 4/5.
> 

Find my reply for this above

Regards,
Suraj Kandpal

> Cheers,
> Maarten


More information about the Intel-xe mailing list