All of lore.kernel.org
 help / color / mirror / Atom feed
From: Oliver Barta <o.barta89@gmail.com>
To: intel-gfx@lists.freedesktop.org,
	Jani Nikula <jani.nikula@linux.intel.com>,
	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Ravisankar Madasamy <ravisankar.madasamy@intel.com>,
	Sean Paul <seanpaul@chromium.org>,
	Oliver Barta <oliver.barta@aptiv.com>
Subject: [Intel-gfx] [PATCH v2 1/3] drm/i915: HDCP: fix Ri prime check done during link check
Date: Fri, 28 Feb 2020 17:18:19 +0100	[thread overview]
Message-ID: <20200228161821.6667-1-oliver.barta@aptiv.com> (raw)
In-Reply-To: <20200226080645.7421-1-oliver.barta@aptiv.com>

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 patch series from master to drm-intel-next-queued branch.

 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 0ac9bdfbc094..ac4276157182 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -1536,7 +1536,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_ERROR("Ri' mismatch detected, link check failed (%x)\n",
 			  intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)));
-- 
2.20.1

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

  parent reply	other threads:[~2020-02-28 17:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-26  8:06 [Intel-gfx] [PATCH 1/3] drm/i915: HDCP: fix Ri prime check done during link check Oliver Barta
2020-02-26  8:06 ` [Intel-gfx] [PATCH 2/3] drm/i915: HDCP: fix Ri prime and R0 checks during auth Oliver Barta
2020-02-26  8:06 ` [Intel-gfx] [PATCH 3/3] drm/i915: HDCP: retry link integrity check on failure Oliver Barta
2020-02-27  1:37 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/3] drm/i915: HDCP: fix Ri prime check done during link check Patchwork
2020-02-28 16:18 ` Oliver Barta [this message]
2020-02-28 16:18   ` [Intel-gfx] [PATCH v2 2/3] drm/i915: HDCP: fix Ri prime and R0 checks during auth Oliver Barta
2020-02-28 16:18   ` [Intel-gfx] [PATCH v2 3/3] drm/i915: HDCP: retry link integrity check on failure Oliver Barta
2020-02-28 19:44 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [v2,3/3] drm/i915: HDCP: retry link integrity check on failure (rev3) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200228161821.6667-1-oliver.barta@aptiv.com \
    --to=o.barta89@gmail.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=joonas.lahtinen@linux.intel.com \
    --cc=oliver.barta@aptiv.com \
    --cc=ravisankar.madasamy@intel.com \
    --cc=seanpaul@chromium.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.