drm/i915: Only disable HDCP when it's active

Instead of always trying to disable HDCP. Only run hdcp_disable when the
state is not UNDESIRED. This will catch cases where it's enabled and
also cases where enable failed and the state is left in DESIRED mode.

Note that things won't blow up if disable is attempted while already
disabled, it's just bad form.

Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180109185330.16853-1-seanpaul@chromium.org

diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index 3c164a27d50bf3354c84042a54ae31ca7b628ee3..827cab22f1915a908400fa8fcc6f762ac1bc23ba 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -616,15 +616,17 @@ out:
 
 int intel_hdcp_disable(struct intel_connector *connector)
 {
-       int ret;
+       int ret = 0;
 
        if (!connector->hdcp_shim)
                return -ENOENT;
 
        mutex_lock(&connector->hdcp_mutex);
 
-       connector->hdcp_value = DRM_MODE_CONTENT_PROTECTION_UNDESIRED;
-       ret = _intel_hdcp_disable(connector);
+       if (connector->hdcp_value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
+               connector->hdcp_value = DRM_MODE_CONTENT_PROTECTION_UNDESIRED;
+               ret = _intel_hdcp_disable(connector);
+       }
 
        mutex_unlock(&connector->hdcp_mutex);
        cancel_delayed_work_sync(&connector->hdcp_check_work);