Commit 3e36c490 authored by Suraj Kandpal's avatar Suraj Kandpal Committed by Ankit Nautiyal

drm/i915/hdcp: Rename comp_mutex to hdcp_mutex

Rename comp_mutex to hdcp_mutex as it does not just
protect component related variables which was a terminology
used when hdcp was to be binded as a mei component from MTL
we use gsc cs which does not use the component binding path
for HDCP.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230529110740.1522985-4-suraj.kandpal@intel.com
parent 5c8ec987
...@@ -404,8 +404,8 @@ struct intel_display { ...@@ -404,8 +404,8 @@ struct intel_display {
* this is only populated post Meteorlake * this is only populated post Meteorlake
*/ */
struct intel_hdcp_gsc_message *hdcp_message; struct intel_hdcp_gsc_message *hdcp_message;
/* Mutex to protect the above hdcp component related values. */ /* Mutex to protect the above hdcp related values. */
struct mutex comp_mutex; struct mutex hdcp_mutex;
} hdcp; } hdcp;
struct { struct {
......
This diff is collapsed.
...@@ -704,12 +704,12 @@ int intel_hdcp_gsc_init(struct drm_i915_private *i915) ...@@ -704,12 +704,12 @@ int intel_hdcp_gsc_init(struct drm_i915_private *i915)
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
mutex_lock(&i915->display.hdcp.comp_mutex); mutex_lock(&i915->display.hdcp.hdcp_mutex);
i915->display.hdcp.arbiter = data; i915->display.hdcp.arbiter = data;
i915->display.hdcp.arbiter->hdcp_dev = i915->drm.dev; i915->display.hdcp.arbiter->hdcp_dev = i915->drm.dev;
i915->display.hdcp.arbiter->ops = &gsc_hdcp_ops; i915->display.hdcp.arbiter->ops = &gsc_hdcp_ops;
ret = intel_hdcp_gsc_hdcp2_init(i915); ret = intel_hdcp_gsc_hdcp2_init(i915);
mutex_unlock(&i915->display.hdcp.comp_mutex); mutex_unlock(&i915->display.hdcp.hdcp_mutex);
return ret; return ret;
} }
......
...@@ -222,7 +222,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) ...@@ -222,7 +222,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
mutex_init(&dev_priv->display.audio.mutex); mutex_init(&dev_priv->display.audio.mutex);
mutex_init(&dev_priv->display.wm.wm_mutex); mutex_init(&dev_priv->display.wm.wm_mutex);
mutex_init(&dev_priv->display.pps.mutex); mutex_init(&dev_priv->display.pps.mutex);
mutex_init(&dev_priv->display.hdcp.comp_mutex); mutex_init(&dev_priv->display.hdcp.hdcp_mutex);
i915_memcpy_init_early(dev_priv); i915_memcpy_init_early(dev_priv);
intel_runtime_pm_init_early(&dev_priv->runtime_pm); intel_runtime_pm_init_early(&dev_priv->runtime_pm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment