[2/3] drm/i915: HDCP: fix Ri prime and R0 checks during auth
diff mbox series

Message ID 20200226080645.7421-2-oliver.barta@aptiv.com
State New
Headers show
Series
  • [1/3] drm/i915: HDCP: fix Ri prime check done during link check
Related show

Commit Message

Oliver Barta Feb. 26, 2020, 8:06 a.m. UTC
Including HDCP_STATUS_ENC bit in the checks is pointless.
It is simply not set at this point.

Signed-off-by: Oliver Barta <oliver.barta@aptiv.com>
Fixes: ee5e5e7a5e0f ("drm/i915: Add HDCP framework + base implementation")
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 0fdbd39f6641..9d7af15e128e 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -689,7 +689,7 @@  static int intel_hdcp_auth(struct intel_connector *connector)
 
 	/* Wait for R0 ready */
 	if (wait_for(I915_READ(HDCP_STATUS(dev_priv, cpu_transcoder, port)) &
-		     (HDCP_STATUS_R0_READY | HDCP_STATUS_ENC), 1)) {
+		     HDCP_STATUS_R0_READY, 1)) {
 		DRM_ERROR("Timed out waiting for R0 ready\n");
 		return -ETIMEDOUT;
 	}
@@ -721,7 +721,7 @@  static int intel_hdcp_auth(struct intel_connector *connector)
 		/* Wait for Ri prime match */
 		if (!wait_for(I915_READ(HDCP_STATUS(dev_priv, cpu_transcoder,
 						    port)) &
-		    (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1))
+		    HDCP_STATUS_RI_MATCH, 1))
 			break;
 	}