Skip to contentSkip to conversation

drm/i915: HDCP: fix Ri prime and R0 checks during auth

PATCH Superseded Oliver Barta 2 participants 2 messages Mar 4, 2020

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: HDCP: fix Ri prime and R0 checks during auth

From: Oliver Barta <[email protected]>

Including HDCP_STATUS_ENC bit in the checks is pointless. It is simply not set at this point.

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(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +2 -2
index 229b4e329864..89d035da95e7 100644
@@ -705,7 +705,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
 
 	/* Wait for R0 ready */
 	if (wait_for(intel_de_read(dev_priv, 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;
 	}
@@ -738,7 +738,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
 
 		/* Wait for Ri prime match */
 		if (!wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) &
-			      (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1))
+			      HDCP_STATUS_RI_MATCH, 1))
 			break;
 	}
 
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: HDCP: fix Ri prime and R0 checks during auth

== Series Details ==

== Series Details ==

Series: drm/i915: HDCP: fix Ri prime and R0 checks during auth
URL : https://patchwork.freedesktop.org/series/74271/
State : failure

== Summary ==

Applying: drm/i915: HDCP: fix Ri prime and R0 checks during auth Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_hdcp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/i915: HDCP: fix Ri prime and R0 checks during auth When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx