On 2020-06-23 at 11:58:58 -0400, Sean Paul wrote:
From: Sean Paul seanpaul@chromium.org
Add an out label and un-indent hdcp disable in preparation for hdcp_mutex. No functional changes
Signed-off-by: Sean Paul seanpaul@chromium.org
Reviewed-by: Ramalingam C ramalingam.c@intel.com
Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-9-sean@po... #v6
Changes in v7:
-Split into separate patch (Ramalingam)
drivers/gpu/drm/i915/display/intel_hdcp.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 62cab3aea745..16bf0fbe5f17 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -2113,16 +2113,17 @@ int intel_hdcp_disable(struct intel_connector *connector)
mutex_lock(&hdcp->mutex);
- if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
intel_hdcp_update_value(connector,DRM_MODE_CONTENT_PROTECTION_UNDESIRED,false);if (hdcp->hdcp2_encrypted)ret = _intel_hdcp2_disable(connector);else if (hdcp->hdcp_encrypted)ret = _intel_hdcp_disable(connector);- }
if (hdcp->value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
goto out;intel_hdcp_update_value(connector,
DRM_MODE_CONTENT_PROTECTION_UNDESIRED, false);if (hdcp->hdcp2_encrypted)
ret = _intel_hdcp2_disable(connector);else if (hdcp->hdcp_encrypted)
ret = _intel_hdcp_disable(connector);+out: mutex_unlock(&hdcp->mutex); cancel_delayed_work_sync(&hdcp->check_work); return ret; -- Sean Paul, Software Engineer, Google / Chromium OS