Re: [Intel-gfx] [PATCH v12 2/6] drm/i915/hdcp: Use generic names for HDCP helpers and structs
> -Original Message-
> From: Kandpal, Suraj
> Sent: Thursday, March 9, 2023 1:24 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Nautiyal, Ankit K ; Shankar, Uma
> ; Gupta, Anshuman ;
> Winkler, Tomas ; Vivi, Rodrigo
> ; Kandpal, Suraj
> Subject: [PATCH v12 2/6] drm/i915/hdcp: Use generic names for HDCP helpers and
> structs
>
> From: Anshuman Gupta
>
> pre MTL we interact with mei interface to talk to firmware and enable CP but
> going
> forward we will talk to gsc cs because of which we are making all names for
> HDCP
> helpers and structures generic as either mei or gsc cs maybe used.
>
> Change the include/drm/i915_mei_hdcp_interface.h to
> include/drm/i915_hdcp_interface.h
>
> Change the i915_hdcp_interface.h header naming convention to suit generic f/w
> type.
> %s/MEI_/HDCP_
> %s/mei_dev/hdcp_dev
>
> Change structure name Accordingly.
> %s/i915_hdcp_comp_master/i915_hdcp_master
> %s/i915_hdcp_component_ops/i915_hdcp_ops
>
> --v6
> -make each patch build individually [Jani]
>
> --v8
> -change ME FW to ME/GSC FW [Ankit]
> -fix formatting issue [Ankit]
>
> --v9
> -fix commit message and header [Uma]
>
> --v10
> -rename comp variable [Uma]
Looks Good to me.
Reviewed-by: Uma Shankar
> 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 | 130 +-
> drivers/misc/mei/hdcp/mei_hdcp.c | 61
> ...hdcp_interface.h => i915_hdcp_interface.h} | 94 ++---
> 5 files changed, 144 insertions(+), 145 deletions(-) rename
> include/drm/{i915_mei_hdcp_interface.h => i915_hdcp_interface.h} (71%)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h
> b/drivers/gpu/drm/i915/display/intel_display_core.h
> index fdab7bb93a7d..d7cb649be915 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> @@ -384,7 +384,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 c32bfba06ca1..cc98a7ad548e 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 2984d2810e42..1ae0882dc1d4 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -1142,18 +1142,18 @@ hdcp2_prepare_ake_init(struct intel_connector
> *connector,
> struct intel_digital_port *dig_port =
> intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_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 *arbiter;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> - comp = dev_priv->display.hdcp.master;
> + arbiter = dev_priv->display.hdcp.master;
>
> - if (!comp || !comp->ops) {
> + if (!arbiter || !arbiter->ops) {
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
> return -EINVAL;
> }
>
> - ret = comp->ops->initiate_hdcp2_session(comp->mei_dev, data, ake_data);
> + ret = arbiter->ops->initiate_hdcp2_session(arbiter->hdcp_dev, data,
> +ake_data);
> if (ret)
> drm_dbg_kms(&dev_priv->drm, "Prepare_ake_init failed. %d\n",
> ret);
> @@ -1172,18 +1172,18 @@ 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 = &dig_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 *arbiter;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> - comp = dev_priv->display.hdcp.master;
> + arbiter = dev_priv->display.hdcp.master;
>
> - if (!comp || !comp->ops) {
> + if (!arbiter || !arbiter->ops) {
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
> return -EINVAL;
> }
>
> - ret = comp->ops->verify_receiver_ce
[Intel-gfx] [PATCH v12 2/6] drm/i915/hdcp: Use generic names for HDCP helpers and structs
From: Anshuman Gupta
pre MTL we interact with mei interface to talk to
firmware and enable CP but going forward we will talk to gsc cs
because of which we are making all names for HDCP helpers and
structures generic as either mei or gsc cs maybe used.
Change the include/drm/i915_mei_hdcp_interface.h to
include/drm/i915_hdcp_interface.h
Change the i915_hdcp_interface.h header naming convention to
suit generic f/w type.
%s/MEI_/HDCP_
%s/mei_dev/hdcp_dev
Change structure name Accordingly.
%s/i915_hdcp_comp_master/i915_hdcp_master
%s/i915_hdcp_component_ops/i915_hdcp_ops
--v6
-make each patch build individually [Jani]
--v8
-change ME FW to ME/GSC FW [Ankit]
-fix formatting issue [Ankit]
--v9
-fix commit message and header [Uma]
--v10
-rename comp variable [Uma]
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 | 130 +-
drivers/misc/mei/hdcp/mei_hdcp.c | 61
...hdcp_interface.h => i915_hdcp_interface.h} | 94 ++---
5 files changed, 144 insertions(+), 145 deletions(-)
rename include/drm/{i915_mei_hdcp_interface.h => i915_hdcp_interface.h} (71%)
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h
b/drivers/gpu/drm/i915/display/intel_display_core.h
index fdab7bb93a7d..d7cb649be915 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -384,7 +384,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 c32bfba06ca1..cc98a7ad548e 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 2984d2810e42..1ae0882dc1d4 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1142,18 +1142,18 @@ hdcp2_prepare_ake_init(struct intel_connector
*connector,
struct intel_digital_port *dig_port =
intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_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 *arbiter;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
- comp = dev_priv->display.hdcp.master;
+ arbiter = dev_priv->display.hdcp.master;
- if (!comp || !comp->ops) {
+ if (!arbiter || !arbiter->ops) {
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
return -EINVAL;
}
- ret = comp->ops->initiate_hdcp2_session(comp->mei_dev, data, ake_data);
+ ret = arbiter->ops->initiate_hdcp2_session(arbiter->hdcp_dev, data,
ake_data);
if (ret)
drm_dbg_kms(&dev_priv->drm, "Prepare_ake_init failed. %d\n",
ret);
@@ -1172,18 +1172,18 @@ 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 = &dig_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 *arbiter;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
- comp = dev_priv->display.hdcp.master;
+ arbiter = dev_priv->display.hdcp.master;
- if (!comp || !comp->ops) {
+ if (!arbiter || !arbiter->ops) {
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
return -EINVAL;
}
- ret = comp->ops->verify_receiver_cert_prepare_km(comp->mei_dev, data,
+ ret = arbiter->ops->verify_receiver_cert_prepare_km(arbiter->hdcp_dev,
data,
rx_cert, paired,
ek_pub_km, msg_sz);
if (ret < 0)
@@ -1200,18 +1200,18 @@ 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 = &dig_port->hdcp_port_data;
struct drm_i9
