Commit a1de8685 authored Aug 18, 2020 by Sean Paul Committed by Ramalingam C Sep 01, 2020

drm/i915: Clean up intel_hdcp_disable



Add an out label and un-indent hdcp disable in preparation for
hdcp_mutex. No functional changes

Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-9-sean@poorly.run #v6
Link: https://patchwork.freedesktop.org/patch/msgid/20200623155907.22961-9-sean@poorly.run

 #v7

Changes in v7:
-Split into separate patch (Ramalingam)
Changes in v8:
-None

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200818153910.27894-9-sean@poorly.run

parent a6597faa

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -2103,16 +2103,17 @@ int intel_hdcp_disable(struct intel_connector *connector)

		mutex_lock(&hdcp->mutex);

		if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
		if (hdcp->value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
		goto out;

		intel_hdcp_update_value(connector,
		DRM_MODE_CONTENT_PROTECTION_UNDESIRED,
		false);
		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;

Admin message