Skip to content

Commit 3e36c49

Browse files
surajk8aknautiyal
surajk8
authored and
aknautiyal
committed
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: Suraj Kandpal <suraj.kandpal@intel.com> Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230529110740.1522985-4-suraj.kandpal@intel.com
1 parent 5c8ec98 commit 3e36c49

4 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎drivers/gpu/drm/i915/display/intel_display_core.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ struct intel_display {
404404
* this is only populated post Meteorlake
405405
*/
406406
struct intel_hdcp_gsc_message *hdcp_message;
407-
/* Mutex to protect the above hdcp component related values. */
408-
struct mutex comp_mutex;
407+
/* Mutex to protect the above hdcp related values. */
408+
struct mutex hdcp_mutex;
409409
} hdcp;
410410

411411
struct {

‎drivers/gpu/drm/i915/display/intel_hdcp.c‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ bool intel_hdcp2_capable(struct intel_connector *connector)
182182
}
183183

184184
/* MEI/GSC interface is solid depending on which is used */
185-
mutex_lock(&i915->display.hdcp.comp_mutex);
185+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
186186
if (!i915->display.hdcp.comp_added || !i915->display.hdcp.arbiter) {
187-
mutex_unlock(&i915->display.hdcp.comp_mutex);
187+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
188188
return false;
189189
}
190-
mutex_unlock(&i915->display.hdcp.comp_mutex);
190+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
191191

192192
/* Sink's capability for HDCP2.2 */
193193
hdcp->shim->hdcp_2_2_capable(dig_port, &capable);
@@ -1117,19 +1117,19 @@ hdcp2_prepare_ake_init(struct intel_connector *connector,
11171117
struct i915_hdcp_arbiter *arbiter;
11181118
int ret;
11191119

1120-
mutex_lock(&i915->display.hdcp.comp_mutex);
1120+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
11211121
arbiter = i915->display.hdcp.arbiter;
11221122

11231123
if (!arbiter || !arbiter->ops) {
1124-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1124+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
11251125
return -EINVAL;
11261126
}
11271127

11281128
ret = arbiter->ops->initiate_hdcp2_session(arbiter->hdcp_dev, data, ake_data);
11291129
if (ret)
11301130
drm_dbg_kms(&i915->drm, "Prepare_ake_init failed. %d\n",
11311131
ret);
1132-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1132+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
11331133

11341134
return ret;
11351135
}
@@ -1147,11 +1147,11 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector *connector,
11471147
struct i915_hdcp_arbiter *arbiter;
11481148
int ret;
11491149

1150-
mutex_lock(&i915->display.hdcp.comp_mutex);
1150+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
11511151
arbiter = i915->display.hdcp.arbiter;
11521152

11531153
if (!arbiter || !arbiter->ops) {
1154-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1154+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
11551155
return -EINVAL;
11561156
}
11571157

@@ -1161,7 +1161,7 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector *connector,
11611161
if (ret < 0)
11621162
drm_dbg_kms(&i915->drm, "Verify rx_cert failed. %d\n",
11631163
ret);
1164-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1164+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
11651165

11661166
return ret;
11671167
}
@@ -1175,18 +1175,18 @@ static int hdcp2_verify_hprime(struct intel_connector *connector,
11751175
struct i915_hdcp_arbiter *arbiter;
11761176
int ret;
11771177

1178-
mutex_lock(&i915->display.hdcp.comp_mutex);
1178+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
11791179
arbiter = i915->display.hdcp.arbiter;
11801180

11811181
if (!arbiter || !arbiter->ops) {
1182-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1182+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
11831183
return -EINVAL;
11841184
}
11851185

11861186
ret = arbiter->ops->verify_hprime(arbiter->hdcp_dev, data, rx_hprime);
11871187
if (ret < 0)
11881188
drm_dbg_kms(&i915->drm, "Verify hprime failed. %d\n", ret);
1189-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1189+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
11901190

11911191
return ret;
11921192
}
@@ -1201,19 +1201,19 @@ hdcp2_store_pairing_info(struct intel_connector *connector,
12011201
struct i915_hdcp_arbiter *arbiter;
12021202
int ret;
12031203

1204-
mutex_lock(&i915->display.hdcp.comp_mutex);
1204+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
12051205
arbiter = i915->display.hdcp.arbiter;
12061206

12071207
if (!arbiter || !arbiter->ops) {
1208-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1208+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
12091209
return -EINVAL;
12101210
}
12111211

12121212
ret = arbiter->ops->store_pairing_info(arbiter->hdcp_dev, data, pairing_info);
12131213
if (ret < 0)
12141214
drm_dbg_kms(&i915->drm, "Store pairing info failed. %d\n",
12151215
ret);
1216-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1216+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
12171217

12181218
return ret;
12191219
}
@@ -1228,19 +1228,19 @@ hdcp2_prepare_lc_init(struct intel_connector *connector,
12281228
struct i915_hdcp_arbiter *arbiter;
12291229
int ret;
12301230

1231-
mutex_lock(&i915->display.hdcp.comp_mutex);
1231+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
12321232
arbiter = i915->display.hdcp.arbiter;
12331233

12341234
if (!arbiter || !arbiter->ops) {
1235-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1235+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
12361236
return -EINVAL;
12371237
}
12381238

12391239
ret = arbiter->ops->initiate_locality_check(arbiter->hdcp_dev, data, lc_init);
12401240
if (ret < 0)
12411241
drm_dbg_kms(&i915->drm, "Prepare lc_init failed. %d\n",
12421242
ret);
1243-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1243+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
12441244

12451245
return ret;
12461246
}
@@ -1255,19 +1255,19 @@ hdcp2_verify_lprime(struct intel_connector *connector,
12551255
struct i915_hdcp_arbiter *arbiter;
12561256
int ret;
12571257

1258-
mutex_lock(&i915->display.hdcp.comp_mutex);
1258+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
12591259
arbiter = i915->display.hdcp.arbiter;
12601260

12611261
if (!arbiter || !arbiter->ops) {
1262-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1262+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
12631263
return -EINVAL;
12641264
}
12651265

12661266
ret = arbiter->ops->verify_lprime(arbiter->hdcp_dev, data, rx_lprime);
12671267
if (ret < 0)
12681268
drm_dbg_kms(&i915->drm, "Verify L_Prime failed. %d\n",
12691269
ret);
1270-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1270+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
12711271

12721272
return ret;
12731273
}
@@ -1281,19 +1281,19 @@ static int hdcp2_prepare_skey(struct intel_connector *connector,
12811281
struct i915_hdcp_arbiter *arbiter;
12821282
int ret;
12831283

1284-
mutex_lock(&i915->display.hdcp.comp_mutex);
1284+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
12851285
arbiter = i915->display.hdcp.arbiter;
12861286

12871287
if (!arbiter || !arbiter->ops) {
1288-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1288+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
12891289
return -EINVAL;
12901290
}
12911291

12921292
ret = arbiter->ops->get_session_key(arbiter->hdcp_dev, data, ske_data);
12931293
if (ret < 0)
12941294
drm_dbg_kms(&i915->drm, "Get session key failed. %d\n",
12951295
ret);
1296-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1296+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
12971297

12981298
return ret;
12991299
}
@@ -1310,11 +1310,11 @@ hdcp2_verify_rep_topology_prepare_ack(struct intel_connector *connector,
13101310
struct i915_hdcp_arbiter *arbiter;
13111311
int ret;
13121312

1313-
mutex_lock(&i915->display.hdcp.comp_mutex);
1313+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
13141314
arbiter = i915->display.hdcp.arbiter;
13151315

13161316
if (!arbiter || !arbiter->ops) {
1317-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1317+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
13181318
return -EINVAL;
13191319
}
13201320

@@ -1325,7 +1325,7 @@ hdcp2_verify_rep_topology_prepare_ack(struct intel_connector *connector,
13251325
if (ret < 0)
13261326
drm_dbg_kms(&i915->drm,
13271327
"Verify rep topology failed. %d\n", ret);
1328-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1328+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
13291329

13301330
return ret;
13311331
}
@@ -1340,18 +1340,18 @@ hdcp2_verify_mprime(struct intel_connector *connector,
13401340
struct i915_hdcp_arbiter *arbiter;
13411341
int ret;
13421342

1343-
mutex_lock(&i915->display.hdcp.comp_mutex);
1343+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
13441344
arbiter = i915->display.hdcp.arbiter;
13451345

13461346
if (!arbiter || !arbiter->ops) {
1347-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1347+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
13481348
return -EINVAL;
13491349
}
13501350

13511351
ret = arbiter->ops->verify_mprime(arbiter->hdcp_dev, data, stream_ready);
13521352
if (ret < 0)
13531353
drm_dbg_kms(&i915->drm, "Verify mprime failed. %d\n", ret);
1354-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1354+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
13551355

13561356
return ret;
13571357
}
@@ -1364,19 +1364,19 @@ static int hdcp2_authenticate_port(struct intel_connector *connector)
13641364
struct i915_hdcp_arbiter *arbiter;
13651365
int ret;
13661366

1367-
mutex_lock(&i915->display.hdcp.comp_mutex);
1367+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
13681368
arbiter = i915->display.hdcp.arbiter;
13691369

13701370
if (!arbiter || !arbiter->ops) {
1371-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1371+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
13721372
return -EINVAL;
13731373
}
13741374

13751375
ret = arbiter->ops->enable_hdcp_authentication(arbiter->hdcp_dev, data);
13761376
if (ret < 0)
13771377
drm_dbg_kms(&i915->drm, "Enable hdcp auth failed. %d\n",
13781378
ret);
1379-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1379+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
13801380

13811381
return ret;
13821382
}
@@ -1388,17 +1388,17 @@ static int hdcp2_close_session(struct intel_connector *connector)
13881388
struct i915_hdcp_arbiter *arbiter;
13891389
int ret;
13901390

1391-
mutex_lock(&i915->display.hdcp.comp_mutex);
1391+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
13921392
arbiter = i915->display.hdcp.arbiter;
13931393

13941394
if (!arbiter || !arbiter->ops) {
1395-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1395+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
13961396
return -EINVAL;
13971397
}
13981398

13991399
ret = arbiter->ops->close_hdcp_session(arbiter->hdcp_dev,
14001400
&dig_port->hdcp_port_data);
1401-
mutex_unlock(&i915->display.hdcp.comp_mutex);
1401+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
14021402

14031403
return ret;
14041404
}
@@ -2108,10 +2108,10 @@ static int i915_hdcp_component_bind(struct device *i915_kdev,
21082108
struct drm_i915_private *i915 = kdev_to_i915(i915_kdev);
21092109

21102110
drm_dbg(&i915->drm, "I915 HDCP comp bind\n");
2111-
mutex_lock(&i915->display.hdcp.comp_mutex);
2111+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
21122112
i915->display.hdcp.arbiter = (struct i915_hdcp_arbiter *)data;
21132113
i915->display.hdcp.arbiter->hdcp_dev = mei_kdev;
2114-
mutex_unlock(&i915->display.hdcp.comp_mutex);
2114+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
21152115

21162116
return 0;
21172117
}
@@ -2122,9 +2122,9 @@ static void i915_hdcp_component_unbind(struct device *i915_kdev,
21222122
struct drm_i915_private *i915 = kdev_to_i915(i915_kdev);
21232123

21242124
drm_dbg(&i915->drm, "I915 HDCP comp unbind\n");
2125-
mutex_lock(&i915->display.hdcp.comp_mutex);
2125+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
21262126
i915->display.hdcp.arbiter = NULL;
2127-
mutex_unlock(&i915->display.hdcp.comp_mutex);
2127+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
21282128
}
21292129

21302130
static const struct component_ops i915_hdcp_ops = {
@@ -2214,11 +2214,11 @@ void intel_hdcp_component_init(struct drm_i915_private *i915)
22142214
if (!is_hdcp2_supported(i915))
22152215
return;
22162216

2217-
mutex_lock(&i915->display.hdcp.comp_mutex);
2217+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
22182218
drm_WARN_ON(&i915->drm, i915->display.hdcp.comp_added);
22192219

22202220
i915->display.hdcp.comp_added = true;
2221-
mutex_unlock(&i915->display.hdcp.comp_mutex);
2221+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
22222222
if (intel_hdcp_gsc_cs_required(i915))
22232223
ret = intel_hdcp_gsc_init(i915);
22242224
else
@@ -2228,9 +2228,9 @@ void intel_hdcp_component_init(struct drm_i915_private *i915)
22282228
if (ret < 0) {
22292229
drm_dbg_kms(&i915->drm, "Failed at fw component add(%d)\n",
22302230
ret);
2231-
mutex_lock(&i915->display.hdcp.comp_mutex);
2231+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
22322232
i915->display.hdcp.comp_added = false;
2233-
mutex_unlock(&i915->display.hdcp.comp_mutex);
2233+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
22342234
return;
22352235
}
22362236
}
@@ -2500,14 +2500,14 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
25002500

25012501
void intel_hdcp_component_fini(struct drm_i915_private *i915)
25022502
{
2503-
mutex_lock(&i915->display.hdcp.comp_mutex);
2503+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
25042504
if (!i915->display.hdcp.comp_added) {
2505-
mutex_unlock(&i915->display.hdcp.comp_mutex);
2505+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
25062506
return;
25072507
}
25082508

25092509
i915->display.hdcp.comp_added = false;
2510-
mutex_unlock(&i915->display.hdcp.comp_mutex);
2510+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
25112511

25122512
if (intel_hdcp_gsc_cs_required(i915))
25132513
intel_hdcp_gsc_fini(i915);

‎drivers/gpu/drm/i915/display/intel_hdcp_gsc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -704,12 +704,12 @@ int intel_hdcp_gsc_init(struct drm_i915_private *i915)
704704
if (!data)
705705
return -ENOMEM;
706706

707-
mutex_lock(&i915->display.hdcp.comp_mutex);
707+
mutex_lock(&i915->display.hdcp.hdcp_mutex);
708708
i915->display.hdcp.arbiter = data;
709709
i915->display.hdcp.arbiter->hdcp_dev = i915->drm.dev;
710710
i915->display.hdcp.arbiter->ops = &gsc_hdcp_ops;
711711
ret = intel_hdcp_gsc_hdcp2_init(i915);
712-
mutex_unlock(&i915->display.hdcp.comp_mutex);
712+
mutex_unlock(&i915->display.hdcp.hdcp_mutex);
713713

714714
return ret;
715715
}

‎drivers/gpu/drm/i915/i915_driver.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
222222
mutex_init(&dev_priv->display.audio.mutex);
223223
mutex_init(&dev_priv->display.wm.wm_mutex);
224224
mutex_init(&dev_priv->display.pps.mutex);
225-
mutex_init(&dev_priv->display.hdcp.comp_mutex);
225+
mutex_init(&dev_priv->display.hdcp.hdcp_mutex);
226226

227227
i915_memcpy_init_early(dev_priv);
228228
intel_runtime_pm_init_early(&dev_priv->runtime_pm);

0 commit comments

Comments
 (0)