All of lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH v2] drm/i915: HDCP: fix Ri prime check done during link check
@ 2020-03-28 10:41 Oliver Barta
  2020-03-29 14:17 ` Ramalingam C
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Oliver Barta @ 2020-03-28 10:41 UTC (permalink / raw)
  To: Ramalingam C, intel-gfx, Jani Nikula, Joonas Lahtinen
  Cc: Daniel Vetter, Oliver Barta, Ravisankar Madasamy, Sean Paul,
	Chris Wilson

From: Oliver Barta <oliver.barta@aptiv.com>

The check was always succeeding even in case of a mismatch due to the
HDCP_STATUS_ENC bit being set. Make sure both bits are actually set.

Signed-off-by: Oliver Barta <oliver.barta@aptiv.com>
Fixes: 2320175feb74 ("drm/i915: Implement HDCP for HDMI")
---
 [v2] rebased on top of latest changes

 drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 0076abc63851..51a69f330588 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -1561,7 +1561,8 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)
 	intel_de_write(i915, HDCP_RPRIME(i915, cpu_transcoder, port), ri.reg);
 
 	/* Wait for Ri prime match */
-	if (wait_for(intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)) &
+	if (wait_for((intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder,
+		     port)) & (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC)) ==
 		     (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) {
 		drm_err(&i915->drm,
 			"Ri' mismatch detected, link check failed (%x)\n",
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-04-16  9:53 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-28 10:41 [Intel-gfx] [PATCH v2] drm/i915: HDCP: fix Ri prime check done during link check Oliver Barta
2020-03-29 14:17 ` Ramalingam C
2020-04-16  9:53   ` Jani Nikula
2020-03-30 16:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: HDCP: fix Ri prime check done during link check (rev2) Patchwork
2020-03-30 17:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-03-31  5:15 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.