On Tue, 27 Feb 2024, Suraj Kandpal <suraj.kandpal@xxxxxxxxx> wrote:
> Move intel_hdcp_gsc_message definition into intel_hdcp_gsc.h
> 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>
Acked-by: Jani Nikula <jani.nikula@xxxxxxxxx>
for merging this patch via drm-xe-next.
BR,
Jani.
> ---
> 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,
--
Jani Nikula, Intel
