drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link

Whenever LIC fails instead of moving from ENABLED to DESIRED
CP property we directly enable HDCP1.4 without informing the userspace
of this failure in link integrity check.
Now we will just update the value to DESIRED send the event to
userspace and then continue with the normal flow of HDCP enablement.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240226063051.1685326-5-suraj.kandpal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 1023153ba9d4ec500ace2cfa1d068b1e82e1c71f..321c6dd8dbf503dc824cf9665bbe4acca4ee9955 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1088,15 +1088,9 @@ static int intel_hdcp_check_link(struct intel_connector *connector)
                goto out;
        }
 
-       ret = intel_hdcp1_enable(connector);
-       if (ret) {
-               drm_err(&i915->drm, "Failed to enable hdcp (%d)\n", ret);
-               intel_hdcp_update_value(connector,
-                                       DRM_MODE_CONTENT_PROTECTION_DESIRED,
-                                       true);
-               goto out;
-       }
-
+       intel_hdcp_update_value(connector,
+                               DRM_MODE_CONTENT_PROTECTION_DESIRED,
+                               true);
 out:
        mutex_unlock(&dig_port->hdcp_mutex);
        mutex_unlock(&hdcp->mutex);