[PATCH 09/10] drm/i915/hdcp: pass struct drm_device to driver specific HDCP GSC code

[Jani Nikula]

On Fri, 02 May 2025, "Kandpal, Suraj" <suraj.kandpal at intel.com> wrote:
>> -----Original Message-----
>> From: Nikula, Jani <jani.nikula at intel.com>
>> Sent: Friday, May 2, 2025 2:53 PM
>> To: Kandpal, Suraj <suraj.kandpal at intel.com>; intel-gfx at lists.freedesktop.org;
>> intel-xe at lists.freedesktop.org
>> Subject: RE: [PATCH 09/10] drm/i915/hdcp: pass struct drm_device to driver
>> specific HDCP GSC code
>> 
>> On Fri, 02 May 2025, "Kandpal, Suraj" <suraj.kandpal at intel.com> wrote:
>> >> -----Original Message-----
>> >> From: Nikula, Jani <jani.nikula at intel.com>
>> >> Sent: Friday, April 25, 2025 1:32 AM
>> >> To: intel-gfx at lists.freedesktop.org; intel-xe at lists.freedesktop.org
>> >> Cc: Nikula, Jani <jani.nikula at intel.com>; Kandpal, Suraj
>> >> <suraj.kandpal at intel.com>
>> >> Subject: [PATCH 09/10] drm/i915/hdcp: pass struct drm_device to
>> >> driver specific HDCP GSC code
>> >>
>> >> The driver specific HDCP GSC code will eventually be part of the
>> >> driver cores rather than display. Remove the struct intel_display
>> >> references from them, and pass struct drm_device instead.
>> >>
>> >> Cc: Suraj Kandpal <suraj.kandpal at intel.com>
>> >> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> >> ---
>> >>  drivers/gpu/drm/i915/display/intel_hdcp.c        |  2 +-
>> >>  drivers/gpu/drm/i915/display/intel_hdcp_gsc.c    | 12 ++++++------
>> >>  drivers/gpu/drm/i915/display/intel_hdcp_gsc.h    |  6 +++---
>> >>  .../drm/i915/display/intel_hdcp_gsc_message.c    |  2 +-
>> >>  drivers/gpu/drm/xe/display/xe_hdcp_gsc.c         | 16 ++++++++--------
>> >>  5 files changed, 19 insertions(+), 19 deletions(-)
>> >>
>> >> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
>> >> b/drivers/gpu/drm/i915/display/intel_hdcp.c
>> >> index 39bcf8f3d810..3e3038f4ee1f 100644
>> >> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
>> >> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
>> >> @@ -254,7 +254,7 @@ static bool intel_hdcp2_prerequisite(struct
>> >> intel_connector *connector)
>> >>
>> >>  	/* If MTL+ make sure gsc is loaded and proxy is setup */
>> >>  	if (USE_HDCP_GSC(display)) {
>> >> -		if (!intel_hdcp_gsc_check_status(display))
>> >> +		if (!intel_hdcp_gsc_check_status(display->drm))
>> >>  			return false;
>> >>  	}
>> >>
>> >> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
>> >> b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
>> >> index 4194ef77f7c3..6a22862d6be1 100644
>> >> --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
>> >> +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
>> >> @@ -19,14 +19,14 @@ struct intel_hdcp_gsc_context {
>> >>  	void *hdcp_cmd_out;
>> >>  };
>> >>
>> >> -bool intel_hdcp_gsc_check_status(struct intel_display *display)
>> >> +bool intel_hdcp_gsc_check_status(struct drm_device *drm)
>> >>  {
>> >
>> > So the thing is this particular function won't be a part of the drm
>> > core seeing this actually is a intel specific Check to see if gsc cs is present or
>> not.
>> 
>> Not *drm* core, but i915 or xe "driver core", after display has been split out.
>> 
>> With that clarification, does the patch make more sense? :)
>
> Ahh ohkay
>
> In that case
> Reviewed-by: Suraj Kandpal <suraj.kandpal at intel.com>

Thanks for the reviews, much appreciated. Series pushed to din now.

BR,
Jani.


-- 
Jani Nikula, Intel