diff mbox series

[2/5] drm/xe/hdcp: Use xe_device struct

Message ID 20240209101412.1326176-3-suraj.kandpal@intel.com (mailing list archive)
State New, archived
Headers show
Series XE HDCP Enablement | expand

Commit Message

Kandpal, Suraj Feb. 9, 2024, 10:14 a.m. UTC
Use xe_device struct instead of drm_i915_private so as to not
cause confusion and comply with Xe standards even though xe_device
gets translated to drm_i915_private.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
 drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Comments

Daniele Ceraolo Spurio Feb. 13, 2024, 11:16 p.m. UTC | #1
On 2/9/2024 2:14 AM, Suraj Kandpal wrote:
> Use xe_device struct instead of drm_i915_private so as to not
> cause confusion and comply with Xe standards even though xe_device
> gets translated to drm_i915_private.

AFAIU xe_device does not get translated to drm_i915_private, it's really 
an xe_device struct under the hood.
The change itself looks ok to me, but I'll leave the final r-b to 
someone on the display side to confirm this is the correct approach.

Daniele

>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> ---
>   drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 15 ++++++++-------
>   1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> index 0f11a39333e2..5d1d0054b578 100644
> --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> @@ -3,30 +3,31 @@
>    * Copyright 2023, Intel Corporation.
>    */
>   
> -#include "i915_drv.h"
> +#include <drm/drm_print.h>
>   #include "intel_hdcp_gsc.h"
> +#include "xe_device_types.h"
>   
> -bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915)
> +bool intel_hdcp_gsc_cs_required(struct xe_device *xe)
>   {
>   	return true;
>   }
>   
> -bool intel_hdcp_gsc_check_status(struct drm_i915_private *i915)
> +bool intel_hdcp_gsc_check_status(struct xe_device *xe)
>   {
>   	return false;
>   }
>   
> -int intel_hdcp_gsc_init(struct drm_i915_private *i915)
> +int intel_hdcp_gsc_init(struct xe_device *xe)
>   {
> -	drm_info(&i915->drm, "HDCP support not yet implemented\n");
> +	drm_dbg_kms(&xe->drm, "HDCP support not yet implemented\n");
>   	return -ENODEV;
>   }
>   
> -void intel_hdcp_gsc_fini(struct drm_i915_private *i915)
> +void intel_hdcp_gsc_fini(struct xe_device *xe)
>   {
>   }
>   
> -ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
> +ssize_t intel_hdcp_gsc_msg_send(struct xe_device *xe, u8 *msg_in,
>   				size_t msg_in_len, u8 *msg_out,
>   				size_t msg_out_len)
>   {
Kandpal, Suraj Feb. 14, 2024, 5:30 a.m. UTC | #2
> 
> On 2/9/2024 2:14 AM, Suraj Kandpal wrote:
> > Use xe_device struct instead of drm_i915_private so as to not cause
> > confusion and comply with Xe standards even though xe_device gets
> > translated to drm_i915_private.
> 
> AFAIU xe_device does not get translated to drm_i915_private, it's really an
> xe_device struct under the hood.
> The change itself looks ok to me, but I'll leave the final r-b to someone on the
> display side to confirm this is the correct approach.
> 

Thanks Daniele for having a look maybe Jani or Ankit can help with the final rb

Regards,
Suraj Kandpal

> Daniele
> 
> >
> > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> > ---
> >   drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 15 ++++++++-------
> >   1 file changed, 8 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > index 0f11a39333e2..5d1d0054b578 100644
> > --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > @@ -3,30 +3,31 @@
> >    * Copyright 2023, Intel Corporation.
> >    */
> >
> > -#include "i915_drv.h"
> > +#include <drm/drm_print.h>
> >   #include "intel_hdcp_gsc.h"
> > +#include "xe_device_types.h"
> >
> > -bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915)
> > +bool intel_hdcp_gsc_cs_required(struct xe_device *xe)
> >   {
> >   	return true;
> >   }
> >
> > -bool intel_hdcp_gsc_check_status(struct drm_i915_private *i915)
> > +bool intel_hdcp_gsc_check_status(struct xe_device *xe)
> >   {
> >   	return false;
> >   }
> >
> > -int intel_hdcp_gsc_init(struct drm_i915_private *i915)
> > +int intel_hdcp_gsc_init(struct xe_device *xe)
> >   {
> > -	drm_info(&i915->drm, "HDCP support not yet implemented\n");
> > +	drm_dbg_kms(&xe->drm, "HDCP support not yet implemented\n");
> >   	return -ENODEV;
> >   }
> >
> > -void intel_hdcp_gsc_fini(struct drm_i915_private *i915)
> > +void intel_hdcp_gsc_fini(struct xe_device *xe)
> >   {
> >   }
> >
> > -ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8
> > *msg_in,
> > +ssize_t intel_hdcp_gsc_msg_send(struct xe_device *xe, u8 *msg_in,
> >   				size_t msg_in_len, u8 *msg_out,
> >   				size_t msg_out_len)
> >   {
Murthy, Arun R Feb. 26, 2024, 8:45 a.m. UTC | #3
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of
> Kandpal, Suraj
> Sent: Wednesday, February 14, 2024 11:00 AM
> To: Ceraolo Spurio, Daniele <daniele.ceraolospurio@intel.com>; intel-
> gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Jani Nikula (jani.nikula@linux.intel.com) <jani.nikula@linux.intel.com>;
> Nautiyal, Ankit K <ankit.k.nautiyal@intel.com>
> Subject: RE: [PATCH 2/5] drm/xe/hdcp: Use xe_device struct
> 
> >
> > On 2/9/2024 2:14 AM, Suraj Kandpal wrote:
> > > Use xe_device struct instead of drm_i915_private so as to not cause
> > > confusion and comply with Xe standards even though xe_device gets
> > > translated to drm_i915_private.
> >
> > AFAIU xe_device does not get translated to drm_i915_private, it's
> > really an xe_device struct under the hood.
> > The change itself looks ok to me, but I'll leave the final r-b to
> > someone on the display side to confirm this is the correct approach.
> >
> 
> Thanks Daniele for having a look maybe Jani or Ankit can help with the final rb
> 
> Regards,
> Suraj Kandpal
> 
> > Daniele
> >
> > >
> > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> > > ---
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>

Thanks and Regards,
Arun R Murthy
-------------------
> > >   drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 15 ++++++++-------
> > >   1 file changed, 8 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > > b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > > index 0f11a39333e2..5d1d0054b578 100644
> > > --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > > +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> > > @@ -3,30 +3,31 @@
> > >    * Copyright 2023, Intel Corporation.
> > >    */
> > >
> > > -#include "i915_drv.h"
> > > +#include <drm/drm_print.h>
> > >   #include "intel_hdcp_gsc.h"
> > > +#include "xe_device_types.h"
> > >
> > > -bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915)
> > > +bool intel_hdcp_gsc_cs_required(struct xe_device *xe)
> > >   {
> > >   	return true;
> > >   }
> > >
> > > -bool intel_hdcp_gsc_check_status(struct drm_i915_private *i915)
> > > +bool intel_hdcp_gsc_check_status(struct xe_device *xe)
> > >   {
> > >   	return false;
> > >   }
> > >
> > > -int intel_hdcp_gsc_init(struct drm_i915_private *i915)
> > > +int intel_hdcp_gsc_init(struct xe_device *xe)
> > >   {
> > > -	drm_info(&i915->drm, "HDCP support not yet implemented\n");
> > > +	drm_dbg_kms(&xe->drm, "HDCP support not yet implemented\n");
> > >   	return -ENODEV;
> > >   }
> > >
> > > -void intel_hdcp_gsc_fini(struct drm_i915_private *i915)
> > > +void intel_hdcp_gsc_fini(struct xe_device *xe)
> > >   {
> > >   }
> > >
> > > -ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8
> > > *msg_in,
> > > +ssize_t intel_hdcp_gsc_msg_send(struct xe_device *xe, u8 *msg_in,
> > >   				size_t msg_in_len, u8 *msg_out,
> > >   				size_t msg_out_len)
> > >   {
diff mbox series

Patch

diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
index 0f11a39333e2..5d1d0054b578 100644
--- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
+++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
@@ -3,30 +3,31 @@ 
  * Copyright 2023, Intel Corporation.
  */
 
-#include "i915_drv.h"
+#include <drm/drm_print.h>
 #include "intel_hdcp_gsc.h"
+#include "xe_device_types.h"
 
-bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915)
+bool intel_hdcp_gsc_cs_required(struct xe_device *xe)
 {
 	return true;
 }
 
-bool intel_hdcp_gsc_check_status(struct drm_i915_private *i915)
+bool intel_hdcp_gsc_check_status(struct xe_device *xe)
 {
 	return false;
 }
 
-int intel_hdcp_gsc_init(struct drm_i915_private *i915)
+int intel_hdcp_gsc_init(struct xe_device *xe)
 {
-	drm_info(&i915->drm, "HDCP support not yet implemented\n");
+	drm_dbg_kms(&xe->drm, "HDCP support not yet implemented\n");
 	return -ENODEV;
 }
 
-void intel_hdcp_gsc_fini(struct drm_i915_private *i915)
+void intel_hdcp_gsc_fini(struct xe_device *xe)
 {
 }
 
-ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
+ssize_t intel_hdcp_gsc_msg_send(struct xe_device *xe, u8 *msg_in,
 				size_t msg_in_len, u8 *msg_out,
 				size_t msg_out_len)
 {