> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Suraj
> Kandpal
> Sent: Tuesday, February 27, 2024 12:04 PM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx; intel-xe@xxxxxxxxxxxxxxxxxxxxx
> Cc: Kandpal, Suraj <suraj.kandpal@xxxxxxxxx>
> Subject: [PATCH 1/4] drm/i915/hdcp: Move intel_hdcp_gsc_message def away
> from header file
>
> Move intel_hdcp_gsc_message definition into intel_hdcp_gsc.c so that
> intel_hdcp_gsc_message can be redefined for xe as needed.
>
> --v2
> -Correct commit message to reflect what patch is actually doing [Arun]
>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx>
Reviewed-by: Arun R Murthy <arun.r.murthy@xxxxxxxxx>
Thanks and Regards,
Arun R Murthy
-------------------
> ---
> 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 302bff75b06c..35823e1f65d6 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.43.2
