xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Clean up intel_hdcp_disable

Browse Source 
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
This commit is contained in:
Sean Paul
2020-08-18 11:38:56 -04:00
committed by Ramalingam C
parent a6597faa2d
commit a1de8685d6
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/i915/display/intel_hdcp.c
View File

@@ -2103,16 +2103,17 @@ int intel_hdcp_disable(struct intel_connector *connector)
mutex_lock(&hdcp->mutex); 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, intel_hdcp_update_value(connector,
DRM_MODE_CONTENT_PROTECTION_UNDESIRED, DRM_MODE_CONTENT_PROTECTION_UNDESIRED, false);
false);
if (hdcp->hdcp2_encrypted) if (hdcp->hdcp2_encrypted)
ret = _intel_hdcp2_disable(connector); ret = _intel_hdcp2_disable(connector);
else if (hdcp->hdcp_encrypted) else if (hdcp->hdcp_encrypted)
ret = _intel_hdcp_disable(connector); ret = _intel_hdcp_disable(connector);
}
out:
mutex_unlock(&hdcp->mutex); mutex_unlock(&hdcp->mutex);
cancel_delayed_work_sync(&hdcp->check_work); cancel_delayed_work_sync(&hdcp->check_work);
return ret; return ret;