Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link"
@ 2025-01-03  8:45 Suraj Kandpal
  2025-01-03 10:18 ` ✗ i915.CI.BAT: failure for Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link" (rev2) Patchwork
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Suraj Kandpal @ 2025-01-03  8:45 UTC (permalink / raw)
  To: intel-xe, intel-gfx; +Cc: dnyaneshwar.bhadane, Suraj Kandpal

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>
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index f6e68a0e3b6d..7464b44c8bb3 100644
--- 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);
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH] Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link"
@ 2024-12-20  5:01 Suraj Kandpal
  2025-01-03  8:34 ` Bhadane, Dnyaneshwar
  0 siblings, 1 reply; 8+ messages in thread
From: Suraj Kandpal @ 2024-12-20  5:01 UTC (permalink / raw)
  To: intel-xe, intel-gfx; +Cc: ankit.k.nautiyal, Suraj Kandpal

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.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index f6e68a0e3b6d..33c705b5ee28 100644
--- 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(&i915->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);
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-01-07 19:13 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-03  8:45 [PATCH] Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link" Suraj Kandpal
2025-01-03 10:18 ` ✗ i915.CI.BAT: failure for Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link" (rev2) Patchwork
2025-01-03 12:38 ` [PATCH] Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link" Bhadane, Dnyaneshwar
2025-01-07 19:13   ` Rodrigo Vivi
2025-01-06  5:51 ` ✓ i915.CI.BAT: success for Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link" (rev2) Patchwork
2025-01-06  8:10 ` ✓ i915.CI.Full: " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2024-12-20  5:01 [PATCH] Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link" Suraj Kandpal
2025-01-03  8:34 ` Bhadane, Dnyaneshwar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox