| Message ID | 20240209101412.1326176-2-suraj.kandpal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | XE HDCP Enablement | expand |
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Suraj > Kandpal > Sent: Friday, February 9, 2024 3:44 PM > To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org > Cc: Ceraolo Spurio, Daniele <daniele.ceraolospurio@intel.com>; Kandpal, Suraj > <suraj.kandpal@intel.com> > Subject: [PATCH 1/5] drm/i915/hdcp: Move intel_hdcp_gsc_message def away > from header file > > Move intel_hdcp_gsc_message definition into intel_hdcp_gsc_message.c so that > intel_hdcp_gsc_message can be redefined for xe as needed. I see it moving from intel_hdcp_gsc.c to .h file and not intel_hdcp_gsc_message.c Thanks and Regards, Arun R Murthy -------------------- > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 6 ++++++ > drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 7 +------ > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c > b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c > index 18117b789b16..e44f60f00e8b 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c > @@ -13,6 +13,12 @@ > #include "intel_hdcp_gsc.h" > #include "intel_hdcp_gsc_message.h" > > +struct intel_hdcp_gsc_message { > + struct i915_vma *vma; > + void *hdcp_cmd_in; > + void *hdcp_cmd_out; > +}; > + > bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915) { > return DISPLAY_VER(i915) >= 14; > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h > b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h > index eba2057c5a9e..5f610df61cc9 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h > +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h > @@ -10,12 +10,7 @@ > #include <linux/types.h> > > struct drm_i915_private; > - > -struct intel_hdcp_gsc_message { > - struct i915_vma *vma; > - void *hdcp_cmd_in; > - void *hdcp_cmd_out; > -}; > +struct intel_hdcp_gsc_message; > > 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, > -- > 2.25.1
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c index 18117b789b16..e44f60f00e8b 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c @@ -13,6 +13,12 @@ #include "intel_hdcp_gsc.h" #include "intel_hdcp_gsc_message.h" +struct intel_hdcp_gsc_message { + struct i915_vma *vma; + void *hdcp_cmd_in; + void *hdcp_cmd_out; +}; + bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915) { return DISPLAY_VER(i915) >= 14; diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h index eba2057c5a9e..5f610df61cc9 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h @@ -10,12 +10,7 @@ #include <linux/types.h> struct drm_i915_private; - -struct intel_hdcp_gsc_message { - struct i915_vma *vma; - void *hdcp_cmd_in; - void *hdcp_cmd_out; -}; +struct intel_hdcp_gsc_message; 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,
Move intel_hdcp_gsc_message definition into intel_hdcp_gsc_message.c so that intel_hdcp_gsc_message can be redefined for xe as needed. Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> --- drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 6 ++++++ drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-)