Re: [Intel-gfx] [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention
> -Original Message-
> From: Shankar, Uma
> Sent: Tuesday, March 7, 2023 12:10 PM
> To: Kandpal, Suraj ; intel-
> g...@lists.freedesktop.org
> Cc: Nautiyal, Ankit K ; Gupta, Anshuman
> ; Winkler, Tomas ;
> Vivi, Rodrigo
> Subject: RE: [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming
> convention
>
>
>
> > -Original Message-
> > From: Kandpal, Suraj
> > Sent: Monday, March 6, 2023 6:20 PM
> > To: Shankar, Uma ;
> > intel-gfx@lists.freedesktop.org
> > Cc: Nautiyal, Ankit K ; Gupta, Anshuman
> > ; Winkler, Tomas
> ;
> > Vivi, Rodrigo
> > Subject: RE: [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming
> > convention
> >
> > >
> > >
> > > > -Original Message-
> > > > From: Kandpal, Suraj
> > > > Sent: Wednesday, February 1, 2023 2:38 PM
> > > > To: intel-gfx@lists.freedesktop.org
> > > > Cc: Nautiyal, Ankit K ; Gupta,
> > > > Anshuman ; Winkler, Tomas
> > > ;
> > > > Vivi, Rodrigo ; Shankar, Uma
> > > > ; Kandpal, Suraj
> > > > Subject: [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming
> > > > convention
> > >
> > > Typo in agnostic.
> > >
> > > Also I feel this header can be re-phrased: "Use generic names for
> > > HDCP helpers and structs"
> > > Add the rationale why this is required, explain the legacy and new
> > > usage which is the cause for this patch.
> > >
> >
> > Sure will add it in the next version
> >
> > Regards,
> > Suraj Kandpal
> > > >
> > > > From: Anshuman Gupta
> > > >
> > > > Change the include/drm/i915_mei_hdcp_interface.h to
> > > > include/drm/i915_hdcp_interface.h
> > > >
> > > > --v6
> > > > -make each patch build individually [Jani]
> > > >
> > > > --v8
> > > > -change ME FW to ME/GSC FW [Ankit] -fix formatting issue [Ankit]
> > > >
> > > > Cc: Tomas Winkler
> > > > Cc: Rodrigo Vivi
> > > > Cc: Uma Shankar
> > > > Cc: Ankit Nautiyal
> > > > Signed-off-by: Anshuman Gupta
> > > > Signed-off-by: Suraj Kandpal
> > > > Reviewed-by: Ankit Nautiyal
> > > > Acked-by: Tomas Winkler
> > > > ---
> > > > .../gpu/drm/i915/display/intel_display_core.h | 2 +-
> > > > .../drm/i915/display/intel_display_types.h| 2 +-
> > > > drivers/gpu/drm/i915/display/intel_hdcp.c | 81
> > > > drivers/misc/mei/hdcp/mei_hdcp.c | 61 ++--
> > > > ...hdcp_interface.h => i915_hdcp_interface.h} | 92
> > > > +--
> > > > 5 files changed, 118 insertions(+), 120 deletions(-) rename
> > > > include/drm/{i915_mei_hdcp_interface.h => i915_hdcp_interface.h}
> > > > (73%)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h
> > > > b/drivers/gpu/drm/i915/display/intel_display_core.h
> > > > index fb8670aa2932..8e7a68339876 100644
> > > > --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> > > > +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> > > > @@ -378,7 +378,7 @@ struct intel_display {
> > > > } gmbus;
> > > >
> > > > struct {
> > > > - struct i915_hdcp_comp_master *master;
> > > > + struct i915_hdcp_master *master;
> > >
> > > Since we are changing this up, can we drop the use of phrase like
> "master"
> > > etc, if feasible in the series, else this can be taken with a follow
> > > up cleanup series.
> >
> > I actually plan on cleaning this up later on in a different hdcp
> > cleanup series
>
> Ok sure, create an internal task to track this.
>
> >
> > >
> > > > bool comp_added;
> > > >
> > > > /* Mutex to protect the above hdcp component related
> > > values. */
> > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> > > > b/drivers/gpu/drm/i915/display/intel_display_types.h
> > > > index 9ccae7a46020..7accd3a8877c 100644
> > > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> > > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> > > > @@ -43,7 +43,7 @@
> > > > #include
> > > > #include
> > > > #include
> > > > -#include
> > > > +#include
> > > > #include
> > > >
> > > > #include "i915_vma.h"
> > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > > > b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > > > index 6406fd487ee5..262c76f21801 100644
> > > > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > > > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > > > @@ -1143,7 +1143,7 @@ hdcp2_prepare_ake_init(struct
> > > > intel_connector *connector,
> > > > struct intel_digital_port *dig_port =
> > > intel_attached_dig_port(connector);
> > > > struct hdcp_port_data *data = _port->hdcp_port_data;
> > > > struct drm_i915_private *dev_priv =
> > > > to_i915(connector->base.dev);
> > > > - struct i915_hdcp_comp_master *comp;
> > > > + struct i915_hdcp_master *comp;
> > >
> > > comp name is relevant if we use component framework, having the name
> > > for a generic case doesn't seem right. Change it universally in patch.
> >
> > I think I lost you here as the change here from my side
Re: [Intel-gfx] [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention
> -Original Message-
> From: Kandpal, Suraj
> Sent: Monday, March 6, 2023 6:20 PM
> To: Shankar, Uma ; intel-gfx@lists.freedesktop.org
> Cc: Nautiyal, Ankit K ; Gupta, Anshuman
> ; Winkler, Tomas ; Vivi,
> Rodrigo
> Subject: RE: [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming
> convention
>
> >
> >
> > > -Original Message-
> > > From: Kandpal, Suraj
> > > Sent: Wednesday, February 1, 2023 2:38 PM
> > > To: intel-gfx@lists.freedesktop.org
> > > Cc: Nautiyal, Ankit K ; Gupta, Anshuman
> > > ; Winkler, Tomas
> > ;
> > > Vivi, Rodrigo ; Shankar, Uma
> > > ; Kandpal, Suraj
> > > Subject: [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming
> > > convention
> >
> > Typo in agnostic.
> >
> > Also I feel this header can be re-phrased: "Use generic names for HDCP
> > helpers and structs"
> > Add the rationale why this is required, explain the legacy and new
> > usage which is the cause for this patch.
> >
>
> Sure will add it in the next version
>
> Regards,
> Suraj Kandpal
> > >
> > > From: Anshuman Gupta
> > >
> > > Change the include/drm/i915_mei_hdcp_interface.h to
> > > include/drm/i915_hdcp_interface.h
> > >
> > > --v6
> > > -make each patch build individually [Jani]
> > >
> > > --v8
> > > -change ME FW to ME/GSC FW [Ankit]
> > > -fix formatting issue [Ankit]
> > >
> > > Cc: Tomas Winkler
> > > Cc: Rodrigo Vivi
> > > Cc: Uma Shankar
> > > Cc: Ankit Nautiyal
> > > Signed-off-by: Anshuman Gupta
> > > Signed-off-by: Suraj Kandpal
> > > Reviewed-by: Ankit Nautiyal
> > > Acked-by: Tomas Winkler
> > > ---
> > > .../gpu/drm/i915/display/intel_display_core.h | 2 +-
> > > .../drm/i915/display/intel_display_types.h| 2 +-
> > > drivers/gpu/drm/i915/display/intel_hdcp.c | 81
> > > drivers/misc/mei/hdcp/mei_hdcp.c | 61 ++--
> > > ...hdcp_interface.h => i915_hdcp_interface.h} | 92
> > > +--
> > > 5 files changed, 118 insertions(+), 120 deletions(-) rename
> > > include/drm/{i915_mei_hdcp_interface.h => i915_hdcp_interface.h}
> > > (73%)
> > >
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h
> > > b/drivers/gpu/drm/i915/display/intel_display_core.h
> > > index fb8670aa2932..8e7a68339876 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> > > +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> > > @@ -378,7 +378,7 @@ struct intel_display {
> > > } gmbus;
> > >
> > > struct {
> > > - struct i915_hdcp_comp_master *master;
> > > + struct i915_hdcp_master *master;
> >
> > Since we are changing this up, can we drop the use of phrase like "master"
> > etc, if feasible in the series, else this can be taken with a follow
> > up cleanup series.
>
> I actually plan on cleaning this up later on in a different hdcp cleanup
> series
Ok sure, create an internal task to track this.
>
> >
> > > bool comp_added;
> > >
> > > /* Mutex to protect the above hdcp component related
> > values. */
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> > > b/drivers/gpu/drm/i915/display/intel_display_types.h
> > > index 9ccae7a46020..7accd3a8877c 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> > > @@ -43,7 +43,7 @@
> > > #include
> > > #include
> > > #include
> > > -#include
> > > +#include
> > > #include
> > >
> > > #include "i915_vma.h"
> > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > > b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > > index 6406fd487ee5..262c76f21801 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > > @@ -1143,7 +1143,7 @@ hdcp2_prepare_ake_init(struct intel_connector
> > > *connector,
> > > struct intel_digital_port *dig_port =
> > intel_attached_dig_port(connector);
> > > struct hdcp_port_data *data = _port->hdcp_port_data;
> > > struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> > > - struct i915_hdcp_comp_master *comp;
> > > + struct i915_hdcp_master *comp;
> >
> > comp name is relevant if we use component framework, having the name
> > for a generic case doesn't seem right. Change it universally in patch.
>
> I think I lost you here as the change here from my side was
> i915_hdcp_comp_master
> to I915_hdcp_master and I left the variable name as is.
> If you do want me to change the variable name what do you think would be
> better
Comp is a name assuming we are using component framework but that is limited to
only mei not gsc. A more generic name would be better.
> > > int ret;
> > >
> > > mutex_lock(_priv->display.hdcp.comp_mutex);
> > > @@ -1154,7 +1154,7 @@ hdcp2_prepare_ake_init(struct intel_connector
> > > *connector,
> > > return -EINVAL;
> > > }
> > >
> > > - ret = comp->ops->initiate_hdcp2_session(comp->mei_dev, data,
> > ake_data);
> > > + ret =
Re: [Intel-gfx] [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention
>
>
> > -Original Message-
> > From: Kandpal, Suraj
> > Sent: Wednesday, February 1, 2023 2:38 PM
> > To: intel-gfx@lists.freedesktop.org
> > Cc: Nautiyal, Ankit K ; Gupta, Anshuman
> > ; Winkler, Tomas
> ;
> > Vivi, Rodrigo ; Shankar, Uma
> > ; Kandpal, Suraj
> > Subject: [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming
> > convention
>
> Typo in agnostic.
>
> Also I feel this header can be re-phrased: "Use generic names for HDCP
> helpers and structs"
> Add the rationale why this is required, explain the legacy and new usage
> which is the cause for this patch.
>
Sure will add it in the next version
Regards,
Suraj Kandpal
> >
> > From: Anshuman Gupta
> >
> > Change the include/drm/i915_mei_hdcp_interface.h to
> > include/drm/i915_hdcp_interface.h
> >
> > --v6
> > -make each patch build individually [Jani]
> >
> > --v8
> > -change ME FW to ME/GSC FW [Ankit]
> > -fix formatting issue [Ankit]
> >
> > Cc: Tomas Winkler
> > Cc: Rodrigo Vivi
> > Cc: Uma Shankar
> > Cc: Ankit Nautiyal
> > Signed-off-by: Anshuman Gupta
> > Signed-off-by: Suraj Kandpal
> > Reviewed-by: Ankit Nautiyal
> > Acked-by: Tomas Winkler
> > ---
> > .../gpu/drm/i915/display/intel_display_core.h | 2 +-
> > .../drm/i915/display/intel_display_types.h| 2 +-
> > drivers/gpu/drm/i915/display/intel_hdcp.c | 81
> > drivers/misc/mei/hdcp/mei_hdcp.c | 61 ++--
> > ...hdcp_interface.h => i915_hdcp_interface.h} | 92
> > +--
> > 5 files changed, 118 insertions(+), 120 deletions(-) rename
> > include/drm/{i915_mei_hdcp_interface.h => i915_hdcp_interface.h} (73%)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h
> > b/drivers/gpu/drm/i915/display/intel_display_core.h
> > index fb8670aa2932..8e7a68339876 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> > @@ -378,7 +378,7 @@ struct intel_display {
> > } gmbus;
> >
> > struct {
> > - struct i915_hdcp_comp_master *master;
> > + struct i915_hdcp_master *master;
>
> Since we are changing this up, can we drop the use of phrase like "master"
> etc, if feasible in the series, else this can be taken with a follow up
> cleanup
> series.
I actually plan on cleaning this up later on in a different hdcp cleanup series
>
> > bool comp_added;
> >
> > /* Mutex to protect the above hdcp component related
> values. */
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> > b/drivers/gpu/drm/i915/display/intel_display_types.h
> > index 9ccae7a46020..7accd3a8877c 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> > @@ -43,7 +43,7 @@
> > #include
> > #include
> > #include
> > -#include
> > +#include
> > #include
> >
> > #include "i915_vma.h"
> > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > index 6406fd487ee5..262c76f21801 100644
> > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > @@ -1143,7 +1143,7 @@ hdcp2_prepare_ake_init(struct intel_connector
> > *connector,
> > struct intel_digital_port *dig_port =
> intel_attached_dig_port(connector);
> > struct hdcp_port_data *data = _port->hdcp_port_data;
> > struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> > - struct i915_hdcp_comp_master *comp;
> > + struct i915_hdcp_master *comp;
>
> comp name is relevant if we use component framework, having the name for
> a generic case doesn't seem right. Change it universally in patch.
I think I lost you here as the change here from my side was
i915_hdcp_comp_master to
I915_hdcp_master and I left the variable name as is.
If you do want me to change the variable name what do you think would be better
>
> > int ret;
> >
> > mutex_lock(_priv->display.hdcp.comp_mutex);
> > @@ -1154,7 +1154,7 @@ hdcp2_prepare_ake_init(struct intel_connector
> > *connector,
> > return -EINVAL;
> > }
> >
> > - ret = comp->ops->initiate_hdcp2_session(comp->mei_dev, data,
> ake_data);
> > + ret = comp->ops->initiate_hdcp2_session(comp->hdcp_dev, data,
> > +ake_data);
> > if (ret)
> > drm_dbg_kms(_priv->drm, "Prepare_ake_init failed.
> %d\n",
> > ret);
> > @@ -1173,7 +1173,7 @@ hdcp2_verify_rx_cert_prepare_km(struct
> > intel_connector *connector,
> > struct intel_digital_port *dig_port =
> intel_attached_dig_port(connector);
> > struct hdcp_port_data *data = _port->hdcp_port_data;
> > struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> > - struct i915_hdcp_comp_master *comp;
> > + struct i915_hdcp_master *comp;
> > int ret;
> >
> > mutex_lock(_priv->display.hdcp.comp_mutex);
> > @@ -1184,7 +1184,7 @@ hdcp2_verify_rx_cert_prepare_km(struct
> >
Re: [Intel-gfx] [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention
> -Original Message-
> From: Kandpal, Suraj
> Sent: Wednesday, February 1, 2023 2:38 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Nautiyal, Ankit K ; Gupta, Anshuman
> ; Winkler, Tomas ; Vivi,
> Rodrigo ; Shankar, Uma ;
> Kandpal, Suraj
> Subject: [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention
Typo in agnostic.
Also I feel this header can be re-phrased: "Use generic names for HDCP helpers
and structs"
Add the rationale why this is required, explain the legacy and new usage which
is the cause
for this patch.
>
> From: Anshuman Gupta
>
> Change the include/drm/i915_mei_hdcp_interface.h to
> include/drm/i915_hdcp_interface.h
>
> --v6
> -make each patch build individually [Jani]
>
> --v8
> -change ME FW to ME/GSC FW [Ankit]
> -fix formatting issue [Ankit]
>
> Cc: Tomas Winkler
> Cc: Rodrigo Vivi
> Cc: Uma Shankar
> Cc: Ankit Nautiyal
> Signed-off-by: Anshuman Gupta
> Signed-off-by: Suraj Kandpal
> Reviewed-by: Ankit Nautiyal
> Acked-by: Tomas Winkler
> ---
> .../gpu/drm/i915/display/intel_display_core.h | 2 +-
> .../drm/i915/display/intel_display_types.h| 2 +-
> drivers/gpu/drm/i915/display/intel_hdcp.c | 81
> drivers/misc/mei/hdcp/mei_hdcp.c | 61 ++--
> ...hdcp_interface.h => i915_hdcp_interface.h} | 92 +--
> 5 files changed, 118 insertions(+), 120 deletions(-) rename
> include/drm/{i915_mei_hdcp_interface.h => i915_hdcp_interface.h} (73%)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h
> b/drivers/gpu/drm/i915/display/intel_display_core.h
> index fb8670aa2932..8e7a68339876 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> @@ -378,7 +378,7 @@ struct intel_display {
> } gmbus;
>
> struct {
> - struct i915_hdcp_comp_master *master;
> + struct i915_hdcp_master *master;
Since we are changing this up, can we drop the use of phrase like "master" etc,
if feasible in the series, else this can be taken with a follow up cleanup
series.
> bool comp_added;
>
> /* Mutex to protect the above hdcp component related values. */
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 9ccae7a46020..7accd3a8877c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -43,7 +43,7 @@
> #include
> #include
> #include
> -#include
> +#include
> #include
>
> #include "i915_vma.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 6406fd487ee5..262c76f21801 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -1143,7 +1143,7 @@ hdcp2_prepare_ake_init(struct intel_connector
> *connector,
> struct intel_digital_port *dig_port =
> intel_attached_dig_port(connector);
> struct hdcp_port_data *data = _port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
comp name is relevant if we use component framework, having the name for a
generic case doesn't seem right. Change it universally in patch.
> int ret;
>
> mutex_lock(_priv->display.hdcp.comp_mutex);
> @@ -1154,7 +1154,7 @@ hdcp2_prepare_ake_init(struct intel_connector
> *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->initiate_hdcp2_session(comp->mei_dev, data, ake_data);
> + ret = comp->ops->initiate_hdcp2_session(comp->hdcp_dev, data,
> +ake_data);
> if (ret)
> drm_dbg_kms(_priv->drm, "Prepare_ake_init failed. %d\n",
> ret);
> @@ -1173,7 +1173,7 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector
> *connector,
> struct intel_digital_port *dig_port =
> intel_attached_dig_port(connector);
> struct hdcp_port_data *data = _port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(_priv->display.hdcp.comp_mutex);
> @@ -1184,7 +1184,7 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector
> *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->verify_receiver_cert_prepare_km(comp->mei_dev, data,
> + ret = comp->ops->verify_receiver_cert_prepare_km(comp->hdcp_dev, data,
>rx_cert, paired,
>ek_pub_km, msg_sz);
> if (ret < 0)
> @@ -1201,7 +1201,7 @@ static int hdcp2_verify_hprime(struct intel_connector
> *connector,
> struct intel_digital_port *dig_port =
>
[Intel-gfx] [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention
From: Anshuman Gupta
Change the include/drm/i915_mei_hdcp_interface.h to
include/drm/i915_hdcp_interface.h
--v6
-make each patch build individually [Jani]
--v8
-change ME FW to ME/GSC FW [Ankit]
-fix formatting issue [Ankit]
Cc: Tomas Winkler
Cc: Rodrigo Vivi
Cc: Uma Shankar
Cc: Ankit Nautiyal
Signed-off-by: Anshuman Gupta
Signed-off-by: Suraj Kandpal
Reviewed-by: Ankit Nautiyal
Acked-by: Tomas Winkler
---
.../gpu/drm/i915/display/intel_display_core.h | 2 +-
.../drm/i915/display/intel_display_types.h| 2 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 81
drivers/misc/mei/hdcp/mei_hdcp.c | 61 ++--
...hdcp_interface.h => i915_hdcp_interface.h} | 92 +--
5 files changed, 118 insertions(+), 120 deletions(-)
rename include/drm/{i915_mei_hdcp_interface.h => i915_hdcp_interface.h} (73%)
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h
b/drivers/gpu/drm/i915/display/intel_display_core.h
index fb8670aa2932..8e7a68339876 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -378,7 +378,7 @@ struct intel_display {
} gmbus;
struct {
- struct i915_hdcp_comp_master *master;
+ struct i915_hdcp_master *master;
bool comp_added;
/* Mutex to protect the above hdcp component related values. */
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
b/drivers/gpu/drm/i915/display/intel_display_types.h
index 9ccae7a46020..7accd3a8877c 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -43,7 +43,7 @@
#include
#include
#include
-#include
+#include
#include
#include "i915_vma.h"
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 6406fd487ee5..262c76f21801 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1143,7 +1143,7 @@ hdcp2_prepare_ake_init(struct intel_connector *connector,
struct intel_digital_port *dig_port =
intel_attached_dig_port(connector);
struct hdcp_port_data *data = _port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(_priv->display.hdcp.comp_mutex);
@@ -1154,7 +1154,7 @@ hdcp2_prepare_ake_init(struct intel_connector *connector,
return -EINVAL;
}
- ret = comp->ops->initiate_hdcp2_session(comp->mei_dev, data, ake_data);
+ ret = comp->ops->initiate_hdcp2_session(comp->hdcp_dev, data, ake_data);
if (ret)
drm_dbg_kms(_priv->drm, "Prepare_ake_init failed. %d\n",
ret);
@@ -1173,7 +1173,7 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector
*connector,
struct intel_digital_port *dig_port =
intel_attached_dig_port(connector);
struct hdcp_port_data *data = _port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(_priv->display.hdcp.comp_mutex);
@@ -1184,7 +1184,7 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector
*connector,
return -EINVAL;
}
- ret = comp->ops->verify_receiver_cert_prepare_km(comp->mei_dev, data,
+ ret = comp->ops->verify_receiver_cert_prepare_km(comp->hdcp_dev, data,
rx_cert, paired,
ek_pub_km, msg_sz);
if (ret < 0)
@@ -1201,7 +1201,7 @@ static int hdcp2_verify_hprime(struct intel_connector
*connector,
struct intel_digital_port *dig_port =
intel_attached_dig_port(connector);
struct hdcp_port_data *data = _port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(_priv->display.hdcp.comp_mutex);
@@ -1212,7 +1212,7 @@ static int hdcp2_verify_hprime(struct intel_connector
*connector,
return -EINVAL;
}
- ret = comp->ops->verify_hprime(comp->mei_dev, data, rx_hprime);
+ ret = comp->ops->verify_hprime(comp->hdcp_dev, data, rx_hprime);
if (ret < 0)
drm_dbg_kms(_priv->drm, "Verify hprime failed. %d\n", ret);
mutex_unlock(_priv->display.hdcp.comp_mutex);
@@ -1227,7 +1227,7 @@ hdcp2_store_pairing_info(struct intel_connector
*connector,
struct intel_digital_port *dig_port =
intel_attached_dig_port(connector);
struct hdcp_port_data *data = _port->hdcp_port_data;
struct drm_i915_private
