* [Intel-gfx] [PATCH] drm/i915: HDCP: fix Ri prime and R0 checks during auth
@ 2020-03-04 7:49 Oliver Barta
2020-03-04 18:03 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
0 siblings, 1 reply; 2+ messages in thread
From: Oliver Barta @ 2020-03-04 7:49 UTC (permalink / raw)
To: Ramalingam C, intel-gfx, Jani Nikula, Joonas Lahtinen
Cc: Daniel Vetter, Oliver Barta, Ravisankar Madasamy, Sean Paul
From: Oliver Barta <oliver.barta@aptiv.com>
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(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 229b4e329864..89d035da95e7 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -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;
}
--
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] 2+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: HDCP: fix Ri prime and R0 checks during auth
2020-03-04 7:49 [Intel-gfx] [PATCH] drm/i915: HDCP: fix Ri prime and R0 checks during auth Oliver Barta
@ 2020-03-04 18:03 ` Patchwork
0 siblings, 0 replies; 2+ messages in thread
From: Patchwork @ 2020-03-04 18:03 UTC (permalink / raw)
To: Oliver Barta; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-04 18:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-04 7:49 [Intel-gfx] [PATCH] drm/i915: HDCP: fix Ri prime and R0 checks during auth Oliver Barta
2020-03-04 18:03 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " 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.