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

This reverts commit 483f7d94a0453564ad9295288c0242136c5f36a0.
This needs to be reverted since HDCP even after updating the connector
state HDCP property we don't reenable HDCP until the next commit
in which the CP Property is set causing compliance to fail.

--v2
-Fix build issue [Dnyaneshwar]

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250103084517.239998-1-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 f6e68a0e3b6d9568209b5d2cc295cff428e033ed..7464b44c8bb36d5c9b4957a084c4ca609e9c17d2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1166,9 +1166,15 @@ static int intel_hdcp_check_link(struct intel_connector *connector)
                goto out;
        }
 
-       intel_hdcp_update_value(connector,
-                               DRM_MODE_CONTENT_PROTECTION_DESIRED,
-                               true);
+       ret = intel_hdcp1_enable(connector);
+       if (ret) {
+               drm_err(display->drm, "Failed to enable hdcp (%d)\n", ret);
+               intel_hdcp_update_value(connector,
+                                       DRM_MODE_CONTENT_PROTECTION_DESIRED,
+                                       true);
+               goto out;
+       }
+
 out:
        mutex_unlock(&dig_port->hdcp_mutex);
        mutex_unlock(&hdcp->mutex);