OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da90417
)
drm/i915: HDCP: fix Ri prime check done during link check
author
Oliver Barta
<oliver.barta@aptiv.com>
Sat, 28 Mar 2020 10:41:00 +0000
(11:41 +0100)
committer
Jani Nikula
<jani.nikula@intel.com>
Thu, 16 Apr 2020 09:50:36 +0000
(12:50 +0300)
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")
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20200328104100.12162-1-oliver.barta@aptiv.com
drivers/gpu/drm/i915/display/intel_hdmi.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/display/intel_hdmi.c
b/drivers/gpu/drm/i915/display/intel_hdmi.c
index
011d83c
..
6b1bc95
100644
(file)
--- 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",