HDCP1.4 fixes
Subsystems (3)
v2 cover HDCP1.4 fixes
First two patches needed for below DP HDCP compliance tests
1A-06 and 1B-05
Third patch fixes the HDCP1.4 Key loadability check. where as fourth one fixes the downstream device count read.
Fix for HDMI HDCP1.4 CTS tests: 1A-04 and 1A-07a are functional. But the change from v2, as thinking to put through more regressive testing before upstreaming.
Ramalingam C (4):
drm/i915: Read HDCP R0 thrice in case of mismatch drm/i915: Read Vprime thrice incase of mismatch drm/i915: Check hdcp key loadability drm/i915: Fix downstream dev count read
drivers/gpu/drm/i915/intel_hdcp.c | 184 ++++++++++++++++++++++++++------------ include/drm/drm_hdcp.h | 2 +- 2 files changed, 129 insertions(+), 57 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/4 drm/i915: Read HDCP R0 thrice in case of mismatch
As per DP spec when R0 mismatch is detected, HDCP source supported re-read the R0 atleast twice.
And For HDMI and DP minimum wait required for the R0 availability is 100mSec. So this patch changes the wait time to 100mSec but retries twice with the time interval of 100mSec for each attempt.
This patch is needed for DP HDCP1.4 CTS Test: 1A-06.
--- drivers/gpu/drm/i915/intel_hdcp.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_hdcp.c +19 -11
@@ -496,9 +496,11 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, }/* -* Wait for R0' to become available. The spec says 100ms from Aksv, but -* some monitors can take longer than this. We'll set the timeout at -* 300ms just to be sure. +* Wait for R0' to become available. The spec says minimum 100ms from +* Aksv, but some monitors can take longer than this. So we are +* combinely waiting for 300mSec just to be sure in case of HDMI. +* DP HDCP Spec mandates the two more reattempt to read R0, incase +* of R0 mismatch. * * On DP, there's an R0_READY bit available but no such bit * exists on HDMI. Since the upper-bound is the same, we'll just do
@@ -506,15 +508,21 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port,*/ wait_remaining_ms_from_jiffies (r0_prime_gen_start,300 ); - ri.reg =0 ; - ret = shim->read_ri_prime (intel_dig_port, ri.shim); -if (ret) -return ret; -I915_WRITE (PORT_HDCP_RPRIME (port), ri.reg); + tries =3 ; +for (i =0 ; i < tries; i++) { + ri.reg =0 ; + ret = shim->read_ri_prime (intel_dig_port, ri.shim); +if (ret) +return ret; +I915_WRITE (PORT_HDCP_RPRIME (port), ri.reg); -/* Wait for Ri prime match */ -if (wait_for (I915_READ (PORT_HDCP_STATUS (port)) & - (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) { +/* Wait for Ri prime match */ +if (!wait_for (I915_READ (PORT_HDCP_STATUS (port)) & + (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) +break ; + } + +if (i == tries) {DRM_ERROR ("Timed out waiting for Ri prime match (%x)\n" ,I915_READ (PORT_HDCP_STATUS (port)));return -ETIMEDOUT ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/4] drm/i915: Read HDCP R0 thrice in case of mismatch
Quoted 20 lines · Ramalingam C
As per DP spec when R0 mismatch is detected, HDCP source supported re-read the R0 atleast twice.
And For HDMI and DP minimum wait required for the R0 availability is 100mSec. So this patch changes the wait time to 100mSec but retries twice with the time interval of 100mSec for each attempt.
This patch is needed for DP HDCP1.4 CTS Test: 1A-06.
Signed-off-by Ramalingam C <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +0
-0@@ -496,9 +496,11 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, }
drivers/gpu/drm/i915/intel_hdcp.c static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, · line 503
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +5
-3/* -* Wait for R0' to become available. The spec says 100ms from Aksv, but -* some monitors can take longer than this. We'll set the timeout at -* 300ms just to be sure. +* Wait for R0' to become available. The spec says minimum 100ms from +* Aksv, but some monitors can take longer than this. So we are +* combinely waiting for 300mSec just to be sure in case of HDMI. +* DP HDCP Spec mandates the two more reattempt to read R0, incase +* of R0 mismatch.
I am sorry to nitpick comments, but this doesn't belong here. Leave this comment alone and add the part about the DP spec requiring retries directly above the loop where we're actually doing the retries.
Sean
Quoted 36 lines
drivers/gpu/drm/i915/intel_hdcp.c +14
-8* * On DP, there's an R0_READY bit available but no such bit * exists on HDMI. Since the upper-bound is the same, we'll just do @@ -506,15 +508,21 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port,*/ wait_remaining_ms_from_jiffies (r0_prime_gen_start,300 ); - ri.reg =0 ; - ret = shim->read_ri_prime (intel_dig_port, ri.shim); -if (ret) -return ret; -I915_WRITE (PORT_HDCP_RPRIME (port), ri.reg); + tries =3 ; +for (i =0 ; i < tries; i++) { + ri.reg =0 ; + ret = shim->read_ri_prime (intel_dig_port, ri.shim); +if (ret) +return ret; +I915_WRITE (PORT_HDCP_RPRIME (port), ri.reg); -/* Wait for Ri prime match */ -if (wait_for (I915_READ (PORT_HDCP_STATUS (port)) & - (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) { +/* Wait for Ri prime match */ +if (!wait_for (I915_READ (PORT_HDCP_STATUS (port)) & + (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) +break ; + } + +if (i == tries) {DRM_ERROR ("Timed out waiting for Ri prime match (%x)\n" ,I915_READ (PORT_HDCP_STATUS (port)));return -ETIMEDOUT ;Signature · 1 line
2.7.4
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/4] drm/i915: Read HDCP R0 thrice in case of mismatch
Quoted 22 lines · Sean Paul
Quoted 21 lines · Ramalingam C
As per DP spec when R0 mismatch is detected, HDCP source supported re-read the R0 atleast twice.
And For HDMI and DP minimum wait required for the R0 availability is 100mSec. So this patch changes the wait time to 100mSec but retries twice with the time interval of 100mSec for each attempt.
This patch is needed for DP HDCP1.4 CTS Test: 1A-06.
Signed-off-by Ramalingam C <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +0
-0@@ -496,9 +496,11 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, }
Quoted 12 lines
drivers/gpu/drm/i915/intel_hdcp.c static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, · line 503
Quoted 9 lines
drivers/gpu/drm/i915/intel_hdcp.c +5
-3/* -* Wait for R0' to become available. The spec says 100ms from Aksv, but -* some monitors can take longer than this. We'll set the timeout at -* 300ms just to be sure. +* Wait for R0' to become available. The spec says minimum 100ms from +* Aksv, but some monitors can take longer than this. So we are +* combinely waiting for 300mSec just to be sure in case of HDMI. +* DP HDCP Spec mandates the two more reattempt to read R0, incase +* of R0 mismatch. I am sorry to nitpick comments, but this doesn't belong here. Leave this comment alone and add the part about the DP spec requiring retries directly above the loop where we're actually doing the retries.
Ok. I will take care in the next ver.
--Ram
Quoted 23 lines
Sean
Quoted 20 lines
drivers/gpu/drm/i915/intel_hdcp.c +7
-5* * On DP, there's an R0_READY bit available but no such bit * exists on HDMI. Since the upper-bound is the same, we'll just do @@ -506,15 +508,21 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port,*/ wait_remaining_ms_from_jiffies (r0_prime_gen_start,300 ); - ri.reg =0 ; - ret = shim->read_ri_prime (intel_dig_port, ri.shim); -if (ret) -return ret; -I915_WRITE (PORT_HDCP_RPRIME (port), ri.reg); + tries =3 ; +for (i =0 ; i < tries; i++) { + ri.reg =0 ; + ret = shim->read_ri_prime (intel_dig_port, ri.shim); +if (ret) +return ret; +I915_WRITE (PORT_HDCP_RPRIME (port), ri.reg);
Quoted 16 lines
Quoted 16 lines
drivers/gpu/drm/i915/intel_hdcp.c +7
-3-/* Wait for Ri prime match */ -if (wait_for (I915_READ (PORT_HDCP_STATUS (port)) & - (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) { +/* Wait for Ri prime match */ +if (!wait_for (I915_READ (PORT_HDCP_STATUS (port)) & + (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) +break ; + } + +if (i == tries) {DRM_ERROR ("Timed out waiting for Ri prime match (%x)\n" ,I915_READ (PORT_HDCP_STATUS (port)));return -ETIMEDOUT ;Signature · 1 line
2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/4 drm/i915: Read Vprime thrice incase of mismatch
In reply to Ramalingam CIn case of V prime mismatch, DP HDCP spec mandates the re-read of Vprime atleast twice.
This patch needed for DP HDCP1.4 CTS Test: 1B-05.
v2:
Moved the V' validation into a function for retry. [Sean Paul]
--- drivers/gpu/drm/i915/intel_hdcp.c | 113 +++++++++++++++++++++++--------------- 1 file changed, 70 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/intel_hdcp.c +70 -43
@@ -142,53 +142,17 @@ bool intel_hdcp_is_ksv_valid(u8 *ksv)return true; } -/* Implements Part 2 of the HDCP authorization procedure */ -static -int intel_hdcp_auth_downstream (struct intel_digital_port *intel_dig_port, -const struct intel_hdcp_shim *shim) +static inline +int intel_hdcp_validate_v_prime (struct intel_digital_port *intel_dig_port, +const struct intel_hdcp_shim *shim, +u8 *ksv_fifo,u8 num_downstream,u8 *bstatus) {struct drm_i915_private *dev_priv;u32 vprime, sha_text, sha_leftovers, rep_ctl; -u8 bstatus[2 ], num_downstream, *ksv_fifo;int ret, i, j, sha_idx; dev_priv = intel_dig_port->base.base.dev->dev_private; - ret =intel_hdcp_poll_ksv_fifo (intel_dig_port, shim); -if (ret) { -DRM_ERROR ("KSV list failed to become ready (%d)\n" , ret); -return ret; - } - - ret = shim->read_bstatus (intel_dig_port, bstatus); -if (ret) -return ret; - -if (DRM_HDCP_MAX_DEVICE_EXCEEDED (bstatus[0 ]) || -DRM_HDCP_MAX_CASCADE_EXCEEDED (bstatus[1 ])) { -DRM_ERROR ("Max Topology Limit Exceeded\n" ); -return -EPERM ; - } - -/* -* When repeater reports 0 device count, HDCP1.4 spec allows disabling -* the HDCP encryption. That implies that repeater can't have its own -* display. As there is no consumption of encrypted content in the -* repeater with 0 downstream devices, we are failing the -* authentication. -*/ - num_downstream =DRM_HDCP_NUM_DOWNSTREAM (bstatus[0 ]); -if (num_downstream ==0 ) -return -EINVAL ; - - ksv_fifo =kzalloc (num_downstream *DRM_HDCP_KSV_LEN ,GFP_KERNEL ); -if (!ksv_fifo) -return -ENOMEM ; - - ret = shim->read_ksv_fifo (intel_dig_port, num_downstream, ksv_fifo); -if (ret) -return ret; -/* Process V' values from the receiver */ for (i =0 ; i <DRM_HDCP_V_PRIME_NUM_PARTS ; i++) { ret = shim->read_v_prime_part (intel_dig_port, i, &vprime);
@@ -353,7 +317,7 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,return ret; sha_idx +=sizeof (sha_text); }else { -DRM_ERROR ("Invalid number of leftovers %d\n" , sha_leftovers); +DRM_DEBUG ("Invalid number of leftovers %d\n" , sha_leftovers);return -EINVAL ; }
@@ -381,14 +345,77 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,if (intel_wait_for_register (dev_priv,HDCP_REP_CTL ,HDCP_SHA1_COMPLETE ,HDCP_SHA1_COMPLETE ,1 )) { -DRM_ERROR ("Timed out waiting for SHA1 complete\n" ); +DRM_DEBUG ("Timed out waiting for SHA1 complete\n" );return -ETIMEDOUT ; }if (!(I915_READ (HDCP_REP_CTL ) &HDCP_SHA1_V_MATCH )) { -DRM_ERROR ("SHA-1 mismatch, HDCP failed\n" ); +DRM_DEBUG ("SHA-1 mismatch, HDCP failed\n" );return -ENXIO ; } +return 0 ; +} + +/* Implements Part 2 of the HDCP authorization procedure */ +static +int intel_hdcp_auth_downstream (struct intel_digital_port *intel_dig_port, +const struct intel_hdcp_shim *shim) +{ +u8 bstatus[2 ], num_downstream, *ksv_fifo; +int ret, i, tries =3 ; + + ret =intel_hdcp_poll_ksv_fifo (intel_dig_port, shim); +if (ret) { +DRM_ERROR ("KSV list failed to become ready (%d)\n" , ret); +return ret; + } + + ret = shim->read_bstatus (intel_dig_port, bstatus); +if (ret) +return ret; + +if (DRM_HDCP_MAX_DEVICE_EXCEEDED (bstatus[0 ]) || +DRM_HDCP_MAX_CASCADE_EXCEEDED (bstatus[1 ])) { +DRM_ERROR ("Max Topology Limit Exceeded\n" ); +return -EPERM ; + } + +/* +* When repeater reports 0 device count, HDCP1.4 spec allows disabling +* the HDCP encryption. That implies that repeater can't have its own +* display. As there is no consumption of encrypted content in the +* repeater with 0 downstream devices, we are failing the +* authentication. +*/ + num_downstream =DRM_HDCP_NUM_DOWNSTREAM (bstatus[0 ]); +if (num_downstream ==0 ) +return -EINVAL ; + + ksv_fifo =kzalloc (num_downstream *DRM_HDCP_KSV_LEN ,GFP_KERNEL ); +if (!ksv_fifo) +return -ENOMEM ; + + ret = shim->read_ksv_fifo (intel_dig_port, num_downstream, ksv_fifo); +if (ret) +return ret; + +/* +* When V prime mismatches, DP Spec mandates re-read of +* V prime atleast twice. +*/ +for (i =0 ; i < tries; i++) { + ret =intel_hdcp_validate_v_prime (intel_dig_port, shim, + ksv_fifo, num_downstream, + bstatus); +if (!ret) +break ; + } + +if (i == tries) { +DRM_ERROR ("V Prime validation failed.(%d)\n" , ret); +return ret; + } +DRM_DEBUG_KMS ("HDCP is enabled (%d downstream devices)\n" , num_downstream);return 0 ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/4] drm/i915: Read Vprime thrice incase of mismatch
Quoted 18 lines · Ramalingam C
In case of V prime mismatch, DP HDCP spec mandates the re-read of Vprime atleast twice.
This patch needed for DP HDCP1.4 CTS Test: 1B-05.
v2:
Moved the V' validation into a function for retry. [Sean Paul]Signed-off-by Ramalingam C <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 113 +++++++++++++++++++++++--------------- 1 file changed, 70 insertions(+), 43 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +0
-0
drivers/gpu/drm/i915/intel_hdcp.c bool intel_hdcp_is_ksv_valid(u8 *ksv) · line 145
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c +1
-4@@ -142,53 +142,17 @@ bool intel_hdcp_is_ksv_valid(u8 *ksv)return true; } -/* Implements Part 2 of the HDCP authorization procedure */ -static -int intel_hdcp_auth_downstream (struct intel_digital_port *intel_dig_port, -const struct intel_hdcp_shim *shim) +static inline
Why inline?
Quoted 59 lines
drivers/gpu/drm/i915/intel_hdcp.c +4
-37+int intel_hdcp_validate_v_prime (struct intel_digital_port *intel_dig_port, +const struct intel_hdcp_shim *shim, +u8 *ksv_fifo,u8 num_downstream,u8 *bstatus) {struct drm_i915_private *dev_priv;u32 vprime, sha_text, sha_leftovers, rep_ctl; -u8 bstatus[2 ], num_downstream, *ksv_fifo;int ret, i, j, sha_idx; dev_priv = intel_dig_port->base.base.dev->dev_private; - ret =intel_hdcp_poll_ksv_fifo (intel_dig_port, shim); -if (ret) { -DRM_ERROR ("KSV list failed to become ready (%d)\n" , ret); -return ret; - } - - ret = shim->read_bstatus (intel_dig_port, bstatus); -if (ret) -return ret; - -if (DRM_HDCP_MAX_DEVICE_EXCEEDED (bstatus[0 ]) || -DRM_HDCP_MAX_CASCADE_EXCEEDED (bstatus[1 ])) { -DRM_ERROR ("Max Topology Limit Exceeded\n" ); -return -EPERM ; - } - -/* -* When repeater reports 0 device count, HDCP1.4 spec allows disabling -* the HDCP encryption. That implies that repeater can't have its own -* display. As there is no consumption of encrypted content in the -* repeater with 0 downstream devices, we are failing the -* authentication. -*/ - num_downstream =DRM_HDCP_NUM_DOWNSTREAM (bstatus[0 ]); -if (num_downstream ==0 ) -return -EINVAL ; - - ksv_fifo =kzalloc (num_downstream *DRM_HDCP_KSV_LEN ,GFP_KERNEL ); -if (!ksv_fifo) -return -ENOMEM ; - - ret = shim->read_ksv_fifo (intel_dig_port, num_downstream, ksv_fifo); -if (ret) -return ret; -/* Process V' values from the receiver */ for (i =0 ; i <DRM_HDCP_V_PRIME_NUM_PARTS ; i++) { ret = shim->read_v_prime_part (intel_dig_port, i, &vprime);@@ -353,7 +317,7 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,return ret; sha_idx +=sizeof (sha_text); }else { -DRM_ERROR ("Invalid number of leftovers %d\n" , sha_leftovers); +DRM_DEBUG ("Invalid number of leftovers %d\n" , sha_leftovers);return -EINVAL ; }
drivers/gpu/drm/i915/intel_hdcp.c int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, · line 352
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-2@@ -381,14 +345,77 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,if (intel_wait_for_register (dev_priv,HDCP_REP_CTL ,HDCP_SHA1_COMPLETE ,HDCP_SHA1_COMPLETE ,1 )) { -DRM_ERROR ("Timed out waiting for SHA1 complete\n" ); +DRM_DEBUG ("Timed out waiting for SHA1 complete\n" );return -ETIMEDOUT ; }if (!(I915_READ (HDCP_REP_CTL ) &HDCP_SHA1_V_MATCH )) { -DRM_ERROR ("SHA-1 mismatch, HDCP failed\n" ); +DRM_DEBUG ("SHA-1 mismatch, HDCP failed\n" );
I think the DEBUG should be DEBUG_KMS, consistent with the rest of the file?
Quoted 72 lines
drivers/gpu/drm/i915/intel_hdcp.c +63
-0return -ENXIO ; } +return 0 ; +} + +/* Implements Part 2 of the HDCP authorization procedure */ +static +int intel_hdcp_auth_downstream (struct intel_digital_port *intel_dig_port, +const struct intel_hdcp_shim *shim) +{ +u8 bstatus[2 ], num_downstream, *ksv_fifo; +int ret, i, tries =3 ; + + ret =intel_hdcp_poll_ksv_fifo (intel_dig_port, shim); +if (ret) { +DRM_ERROR ("KSV list failed to become ready (%d)\n" , ret); +return ret; + } + + ret = shim->read_bstatus (intel_dig_port, bstatus); +if (ret) +return ret; + +if (DRM_HDCP_MAX_DEVICE_EXCEEDED (bstatus[0 ]) || +DRM_HDCP_MAX_CASCADE_EXCEEDED (bstatus[1 ])) { +DRM_ERROR ("Max Topology Limit Exceeded\n" ); +return -EPERM ; + } + +/* +* When repeater reports 0 device count, HDCP1.4 spec allows disabling +* the HDCP encryption. That implies that repeater can't have its own +* display. As there is no consumption of encrypted content in the +* repeater with 0 downstream devices, we are failing the +* authentication. +*/ + num_downstream =DRM_HDCP_NUM_DOWNSTREAM (bstatus[0 ]); +if (num_downstream ==0 ) +return -EINVAL ; + + ksv_fifo =kzalloc (num_downstream *DRM_HDCP_KSV_LEN ,GFP_KERNEL ); +if (!ksv_fifo) +return -ENOMEM ; + + ret = shim->read_ksv_fifo (intel_dig_port, num_downstream, ksv_fifo); +if (ret) +return ret; + +/* +* When V prime mismatches, DP Spec mandates re-read of +* V prime atleast twice. +*/ +for (i =0 ; i < tries; i++) { + ret =intel_hdcp_validate_v_prime (intel_dig_port, shim, + ksv_fifo, num_downstream, + bstatus); +if (!ret) +break ; + } + +if (i == tries) { +DRM_ERROR ("V Prime validation failed.(%d)\n" , ret); +return ret; + } +DRM_DEBUG_KMS ("HDCP is enabled (%d downstream devices)\n" , num_downstream);return 0 ;Signature · 1 line
2.7.4
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/4] drm/i915: Read Vprime thrice incase of mismatch
Quoted 22 lines · Sean Paul
Quoted 21 lines · Ramalingam C
In case of V prime mismatch, DP HDCP spec mandates the re-read of Vprime atleast twice.
This patch needed for DP HDCP1.4 CTS Test: 1B-05.
v2:
Moved the V' validation into a function for retry. [Sean Paul]Signed-off-by Ramalingam C <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 113 +++++++++++++++++++++++--------------- 1 file changed, 70 insertions(+), 43 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +0
-0@@ -142,53 +142,17 @@ bool intel_hdcp_is_ksv_valid(u8 *ksv)return true; }
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdcp.c bool intel_hdcp_is_ksv_valid(u8 *ksv) · line 145
Quoted 5 lines
drivers/gpu/drm/i915/intel_hdcp.c +1
-4-/* Implements Part 2 of the HDCP authorization procedure */ -static -int intel_hdcp_auth_downstream (struct intel_digital_port *intel_dig_port, -const struct intel_hdcp_shim *shim) +static inlineWhy inline?
Its a mistake. Will correct it. thanks
Quoted 59 lines
Quoted 59 lines
drivers/gpu/drm/i915/intel_hdcp.c +4
-37+int intel_hdcp_validate_v_prime (struct intel_digital_port *intel_dig_port, +const struct intel_hdcp_shim *shim, +u8 *ksv_fifo,u8 num_downstream,u8 *bstatus) {struct drm_i915_private *dev_priv;u32 vprime, sha_text, sha_leftovers, rep_ctl; -u8 bstatus[2 ], num_downstream, *ksv_fifo;int ret, i, j, sha_idx; dev_priv = intel_dig_port->base.base.dev->dev_private; - ret =intel_hdcp_poll_ksv_fifo (intel_dig_port, shim); -if (ret) { -DRM_ERROR ("KSV list failed to become ready (%d)\n" , ret); -return ret; - } - - ret = shim->read_bstatus (intel_dig_port, bstatus); -if (ret) -return ret; - -if (DRM_HDCP_MAX_DEVICE_EXCEEDED (bstatus[0 ]) || -DRM_HDCP_MAX_CASCADE_EXCEEDED (bstatus[1 ])) { -DRM_ERROR ("Max Topology Limit Exceeded\n" ); -return -EPERM ; - } - -/* -* When repeater reports 0 device count, HDCP1.4 spec allows disabling -* the HDCP encryption. That implies that repeater can't have its own -* display. As there is no consumption of encrypted content in the -* repeater with 0 downstream devices, we are failing the -* authentication. -*/ - num_downstream =DRM_HDCP_NUM_DOWNSTREAM (bstatus[0 ]); -if (num_downstream ==0 ) -return -EINVAL ; - - ksv_fifo =kzalloc (num_downstream *DRM_HDCP_KSV_LEN ,GFP_KERNEL ); -if (!ksv_fifo) -return -ENOMEM ; - - ret = shim->read_ksv_fifo (intel_dig_port, num_downstream, ksv_fifo); -if (ret) -return ret; -/* Process V' values from the receiver */ for (i =0 ; i <DRM_HDCP_V_PRIME_NUM_PARTS ; i++) { ret = shim->read_v_prime_part (intel_dig_port, i, &vprime);@@ -353,7 +317,7 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,return ret; sha_idx +=sizeof (sha_text); }else { -DRM_ERROR ("Invalid number of leftovers %d\n" , sha_leftovers); +DRM_DEBUG ("Invalid number of leftovers %d\n" , sha_leftovers);return -EINVAL ; }
Quoted 12 lines
drivers/gpu/drm/i915/intel_hdcp.c int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, · line 352
Quoted 11 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-2@@ -381,14 +345,77 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,if (intel_wait_for_register (dev_priv,HDCP_REP_CTL ,HDCP_SHA1_COMPLETE ,HDCP_SHA1_COMPLETE ,1 )) { -DRM_ERROR ("Timed out waiting for SHA1 complete\n" ); +DRM_DEBUG ("Timed out waiting for SHA1 complete\n" );return -ETIMEDOUT ; }if (!(I915_READ (HDCP_REP_CTL ) &HDCP_SHA1_V_MATCH )) { -DRM_ERROR ("SHA-1 mismatch, HDCP failed\n" ); +DRM_DEBUG ("SHA-1 mismatch, HDCP failed\n" );I think the DEBUG should be
DEBUG_KMS, consistent with the rest of the file?
Will make it uniform
--Ram
Quoted 65 lines
Quoted 65 lines
drivers/gpu/drm/i915/intel_hdcp.c +61
-0return -ENXIO ; } +return 0 ; +} + +/* Implements Part 2 of the HDCP authorization procedure */ +static +int intel_hdcp_auth_downstream (struct intel_digital_port *intel_dig_port, +const struct intel_hdcp_shim *shim) +{ +u8 bstatus[2 ], num_downstream, *ksv_fifo; +int ret, i, tries =3 ; + + ret =intel_hdcp_poll_ksv_fifo (intel_dig_port, shim); +if (ret) { +DRM_ERROR ("KSV list failed to become ready (%d)\n" , ret); +return ret; + } + + ret = shim->read_bstatus (intel_dig_port, bstatus); +if (ret) +return ret; + +if (DRM_HDCP_MAX_DEVICE_EXCEEDED (bstatus[0 ]) || +DRM_HDCP_MAX_CASCADE_EXCEEDED (bstatus[1 ])) { +DRM_ERROR ("Max Topology Limit Exceeded\n" ); +return -EPERM ; + } + +/* +* When repeater reports 0 device count, HDCP1.4 spec allows disabling +* the HDCP encryption. That implies that repeater can't have its own +* display. As there is no consumption of encrypted content in the +* repeater with 0 downstream devices, we are failing the +* authentication. +*/ + num_downstream =DRM_HDCP_NUM_DOWNSTREAM (bstatus[0 ]); +if (num_downstream ==0 ) +return -EINVAL ; + + ksv_fifo =kzalloc (num_downstream *DRM_HDCP_KSV_LEN ,GFP_KERNEL ); +if (!ksv_fifo) +return -ENOMEM ; + + ret = shim->read_ksv_fifo (intel_dig_port, num_downstream, ksv_fifo); +if (ret) +return ret; + +/* +* When V prime mismatches, DP Spec mandates re-read of +* V prime atleast twice. +*/ +for (i =0 ; i < tries; i++) { + ret =intel_hdcp_validate_v_prime (intel_dig_port, shim, + ksv_fifo, num_downstream, + bstatus); +if (!ret) +break ; + } + +if (i == tries) { +DRM_ERROR ("V Prime validation failed.(%d)\n" , ret); +return ret;
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-0+ } +DRM_DEBUG_KMS ("HDCP is enabled (%d downstream devices)\n" , num_downstream);return 0 ;Signature · 1 line
2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 3/4 drm/i915: Check hdcp key loadability
In reply to Ramalingam CHDCP1.4 key can be loaded, only when Power well #1 is enabled and cdclk is enabled. Using the I915 power well infrastruture, above requirement is verified.
This patch enables the hdcp initialization for HSW, BDW, and BXT.
v2:
Choose the PW# based on the platform.
--- drivers/gpu/drm/i915/intel_hdcp.c | 41 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_hdcp.c +39 -2
@@ -37,6 +37,43 @@ static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,return 0 ; } +static bool hdcp_key_loadable (struct drm_i915_private *dev_priv) +{ +struct i915_power_domains *power_domains = &dev_priv->power_domains; +struct i915_power_well *power_well; +enum i915_power_well_id id; +bool enabled = false; + +/* +* On HSW and BDW, Display HW loads the Key as soon as Display resumes. +* On all BXT+, SW can load the keys only when the PW#1 is turned on. +*/ +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) + id =HSW_DISP_PW_GLOBAL ; +else + id =SKL_DISP_PW_1 ; + +mutex_lock (&power_domains->lock); + +/* PG1 (power well #1) needs to be enabled */ +for_each_power_well (dev_priv, power_well) { +if (power_well->id == id) { + enabled = power_well->ops->is_enabled (dev_priv, + power_well); +break ; + } + } +mutex_unlock (&power_domains->lock); + +/* +* Another req for hdcp key loadability is enabled state of pll for +* cdclk. Without active crtc we wont land here. So we are assuming that +* cdclk is already on. +*/ + +return enabled; +} +static void intel_hdcp_clear_keys (struct drm_i915_private *dev_priv) {I915_WRITE (HDCP_KEY_CONF ,HDCP_CLEAR_KEYS_TRIGGER );
@@ -615,8 +652,8 @@ static int _intel_hdcp_enable(struct intel_connector *connector)DRM_DEBUG_KMS ("[%s:%d] HDCP is being enabled...\n" , connector->base.name, connector->base.base.id); -if (!(I915_READ (SKL_FUSE_STATUS ) &SKL_FUSE_PG_DIST_STATUS (1 ))) { -DRM_ERROR ("PG1 is disabled, cannot load keys\n" ); +if (!hdcp_key_loadable (dev_priv)) { +DRM_ERROR ("HDCP key Load is not possible\n" );return -ENXIO ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/4] drm/i915: Check hdcp key loadability
Quoted 64 lines · Ramalingam C
HDCP1.4 key can be loaded, only when Power well #1 is enabled and cdclk is enabled. Using the I915 power well infrastruture, above requirement is verified.
This patch enables the hdcp initialization for HSW, BDW, and BXT.
v2:
Choose the PW# based on the platform.Signed-off-by Ramalingam C <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 41 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +37
-0@@ -37,6 +37,43 @@ static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,return 0 ; } +static bool hdcp_key_loadable (struct drm_i915_private *dev_priv) +{ +struct i915_power_domains *power_domains = &dev_priv->power_domains; +struct i915_power_well *power_well; +enum i915_power_well_id id; +bool enabled = false; + +/* +* On HSW and BDW, Display HW loads the Key as soon as Display resumes. +* On all BXT+, SW can load the keys only when the PW#1 is turned on. +*/ +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) + id =HSW_DISP_PW_GLOBAL ; +else + id =SKL_DISP_PW_1 ; + +mutex_lock (&power_domains->lock); + +/* PG1 (power well #1) needs to be enabled */ +for_each_power_well (dev_priv, power_well) { +if (power_well->id == id) { + enabled = power_well->ops->is_enabled (dev_priv, + power_well); +break ; + } + } +mutex_unlock (&power_domains->lock); + +/* +* Another req for hdcp key loadability is enabled state of pll for +* cdclk. Without active crtc we wont land here. So we are assuming that +* cdclk is already on. +*/ + +return enabled; +} +static void intel_hdcp_clear_keys (struct drm_i915_private *dev_priv) {I915_WRITE (HDCP_KEY_CONF ,HDCP_CLEAR_KEYS_TRIGGER );
drivers/gpu/drm/i915/intel_hdcp.c static int _intel_hdcp_enable(struct intel_connector *connector) · line 658
Quoted 9 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-2@@ -615,8 +652,8 @@ static int _intel_hdcp_enable(struct intel_connector *connector)DRM_DEBUG_KMS ("[%s:%d] HDCP is being enabled...\n" , connector->base.name, connector->base.base.id); -if (!(I915_READ (SKL_FUSE_STATUS ) &SKL_FUSE_PG_DIST_STATUS (1 ))) { -DRM_ERROR ("PG1 is disabled, cannot load keys\n" ); +if (!hdcp_key_loadable (dev_priv)) { +DRM_ERROR ("HDCP key Load is not possible\n" );return -ENXIO ; }
If you need the power well then why aren't you grabbing the correct power domain reference somewhere?
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/4] drm/i915: Check hdcp key loadability
Quoted 68 lines · Ville Syrjälä
Quoted 67 lines · Ramalingam C
HDCP1.4 key can be loaded, only when Power well #1 is enabled and cdclk is enabled. Using the I915 power well infrastruture, above requirement is verified.
This patch enables the hdcp initialization for HSW, BDW, and BXT.
v2:
Choose the PW# based on the platform.Signed-off-by Ramalingam C <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 41 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +37
-0@@ -37,6 +37,43 @@ static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,return 0 ; } +static bool hdcp_key_loadable (struct drm_i915_private *dev_priv) +{ +struct i915_power_domains *power_domains = &dev_priv->power_domains; +struct i915_power_well *power_well; +enum i915_power_well_id id; +bool enabled = false; + +/* +* On HSW and BDW, Display HW loads the Key as soon as Display resumes. +* On all BXT+, SW can load the keys only when the PW#1 is turned on. +*/ +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) + id =HSW_DISP_PW_GLOBAL ; +else + id =SKL_DISP_PW_1 ; + +mutex_lock (&power_domains->lock); + +/* PG1 (power well #1) needs to be enabled */ +for_each_power_well (dev_priv, power_well) { +if (power_well->id == id) { + enabled = power_well->ops->is_enabled (dev_priv, + power_well); +break ; + } + } +mutex_unlock (&power_domains->lock); + +/* +* Another req for hdcp key loadability is enabled state of pll for +* cdclk. Without active crtc we wont land here. So we are assuming that +* cdclk is already on. +*/ + +return enabled; +} +static void intel_hdcp_clear_keys (struct drm_i915_private *dev_priv) {I915_WRITE (HDCP_KEY_CONF ,HDCP_CLEAR_KEYS_TRIGGER );@@ -615,8 +652,8 @@ static int _intel_hdcp_enable(struct intel_connector *connector)DRM_DEBUG_KMS ("[%s:%d] HDCP is being enabled...\n" , connector->base.name, connector->base.base.id);
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c static int _intel_hdcp_enable(struct intel_connector *connector) · line 658
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-2-if (!(I915_READ (SKL_FUSE_STATUS ) &SKL_FUSE_PG_DIST_STATUS (1 ))) { -DRM_ERROR ("PG1 is disabled, cannot load keys\n" ); +if (!hdcp_key_loadable (dev_priv)) { +DRM_ERROR ("HDCP key Load is not possible\n" );return -ENXIO ; }If you need the power well then why aren't you grabbing the correct power domain reference somewhere?
Ville,
As HDCP is supposed to be enabled after the basic display is up, power well #1 is supposed to be enabled. If not that is mostly an error w.r.t HDCP.
So at this point we just want to verify whether required PW is up and HDCP key can be loaded from the HW. Else fail the HDCP request.
--Ram
Quoted 1 line
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/4] drm/i915: Check hdcp key loadability
Quoted 80 lines · Ramalingam C
Quoted 68 lines · Ville Syrjälä
Quoted 67 lines · Ramalingam C
HDCP1.4 key can be loaded, only when Power well #1 is enabled and cdclk is enabled. Using the I915 power well infrastruture, above requirement is verified.
This patch enables the hdcp initialization for HSW, BDW, and BXT.
v2:
Choose the PW# based on the platform.Signed-off-by Ramalingam C <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 41 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +37
-0@@ -37,6 +37,43 @@ static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,return 0 ; } +static bool hdcp_key_loadable (struct drm_i915_private *dev_priv) +{ +struct i915_power_domains *power_domains = &dev_priv->power_domains; +struct i915_power_well *power_well; +enum i915_power_well_id id; +bool enabled = false; + +/* +* On HSW and BDW, Display HW loads the Key as soon as Display resumes. +* On all BXT+, SW can load the keys only when the PW#1 is turned on. +*/ +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) + id =HSW_DISP_PW_GLOBAL ; +else + id =SKL_DISP_PW_1 ; + +mutex_lock (&power_domains->lock); + +/* PG1 (power well #1) needs to be enabled */ +for_each_power_well (dev_priv, power_well) { +if (power_well->id == id) { + enabled = power_well->ops->is_enabled (dev_priv, + power_well); +break ; + } + } +mutex_unlock (&power_domains->lock); + +/* +* Another req for hdcp key loadability is enabled state of pll for +* cdclk. Without active crtc we wont land here. So we are assuming that +* cdclk is already on. +*/ + +return enabled; +} +static void intel_hdcp_clear_keys (struct drm_i915_private *dev_priv) {I915_WRITE (HDCP_KEY_CONF ,HDCP_CLEAR_KEYS_TRIGGER );@@ -615,8 +652,8 @@ static int _intel_hdcp_enable(struct intel_connector *connector)DRM_DEBUG_KMS ("[%s:%d] HDCP is being enabled...\n" , connector->base.name, connector->base.base.id);Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c static int _intel_hdcp_enable(struct intel_connector *connector) · line 658
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-2-if (!(I915_READ (SKL_FUSE_STATUS ) &SKL_FUSE_PG_DIST_STATUS (1 ))) { -DRM_ERROR ("PG1 is disabled, cannot load keys\n" ); +if (!hdcp_key_loadable (dev_priv)) { +DRM_ERROR ("HDCP key Load is not possible\n" );return -ENXIO ; }If you need the power well then why aren't you grabbing the correct power domain reference somewhere?
Quoted 6 lines
Ville,
As HDCP is supposed to be enabled after the basic display is up, power well #1 is supposed to be enabled. If not that is mostly an error w.r.t HDCP.
So at this point we just want to verify whether required PW is up and HDCP key can be loaded from the HW. Else fail the HDCP request.
So this is in practice dead code to deal with a hypothetical bug elsewhere in the driver?
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 3/4] drm/i915: Check hdcp key loadability
Quoted 83 lines · Ville Syrjälä
Quoted 82 lines · Ramalingam C
Quoted 68 lines · Ville Syrjälä
Quoted 67 lines · Ramalingam C
HDCP1.4 key can be loaded, only when Power well #1 is enabled and cdclk is enabled. Using the I915 power well infrastruture, above requirement is verified.
This patch enables the hdcp initialization for HSW, BDW, and BXT.
v2:
Choose the PW# based on the platform.Signed-off-by Ramalingam C <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 41 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +37
-0@@ -37,6 +37,43 @@ static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,return 0 ; } +static bool hdcp_key_loadable (struct drm_i915_private *dev_priv) +{ +struct i915_power_domains *power_domains = &dev_priv->power_domains; +struct i915_power_well *power_well; +enum i915_power_well_id id; +bool enabled = false; + +/* +* On HSW and BDW, Display HW loads the Key as soon as Display resumes. +* On all BXT+, SW can load the keys only when the PW#1 is turned on. +*/ +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) + id =HSW_DISP_PW_GLOBAL ; +else + id =SKL_DISP_PW_1 ; + +mutex_lock (&power_domains->lock); + +/* PG1 (power well #1) needs to be enabled */ +for_each_power_well (dev_priv, power_well) { +if (power_well->id == id) { + enabled = power_well->ops->is_enabled (dev_priv, + power_well); +break ; + } + } +mutex_unlock (&power_domains->lock); + +/* +* Another req for hdcp key loadability is enabled state of pll for +* cdclk. Without active crtc we wont land here. So we are assuming that +* cdclk is already on. +*/ + +return enabled; +} +static void intel_hdcp_clear_keys (struct drm_i915_private *dev_priv) {I915_WRITE (HDCP_KEY_CONF ,HDCP_CLEAR_KEYS_TRIGGER );@@ -615,8 +652,8 @@ static int _intel_hdcp_enable(struct intel_connector *connector)DRM_DEBUG_KMS ("[%s:%d] HDCP is being enabled...\n" , connector->base.name, connector->base.base.id);Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c static int _intel_hdcp_enable(struct intel_connector *connector) · line 658
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-2-if (!(I915_READ (SKL_FUSE_STATUS ) &SKL_FUSE_PG_DIST_STATUS (1 ))) { -DRM_ERROR ("PG1 is disabled, cannot load keys\n" ); +if (!hdcp_key_loadable (dev_priv)) { +DRM_ERROR ("HDCP key Load is not possible\n" );return -ENXIO ; }If you need the power well then why aren't you grabbing the correct power domain reference somewhere?
Ville,
Quoted 7 lines
Quoted 4 lines
As HDCP is supposed to be enabled after the basic display is up, power well #1 is supposed to be enabled. If not that is mostly an error w.r.t HDCP.
So at this point we just want to verify whether required PW is up and HDCP key can be loaded from the HW. Else fail the HDCP request.
So this is in practice dead code to deal with a hypothetical bug elsewhere in the driver?
Yeah looks like it should be wrapped in a WARN_ON, or maybe outright thrown out. The unclaimed mmio debug stuff will catch when this happens (or well, should).
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/4] drm/i915: Check hdcp key loadability
Quoted 85 lines · Daniel Vetter
Quoted 84 lines · Ville Syrjälä
Quoted 83 lines · Ramalingam C
Quoted 68 lines · Ville Syrjälä
Quoted 67 lines · Ramalingam C
HDCP1.4 key can be loaded, only when Power well #1 is enabled and cdclk is enabled. Using the I915 power well infrastruture, above requirement is verified.
This patch enables the hdcp initialization for HSW, BDW, and BXT.
v2:
Choose the PW# based on the platform.Signed-off-by Ramalingam C <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 41 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +37
-0@@ -37,6 +37,43 @@ static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,return 0 ; } +static bool hdcp_key_loadable (struct drm_i915_private *dev_priv) +{ +struct i915_power_domains *power_domains = &dev_priv->power_domains; +struct i915_power_well *power_well; +enum i915_power_well_id id; +bool enabled = false; + +/* +* On HSW and BDW, Display HW loads the Key as soon as Display resumes. +* On all BXT+, SW can load the keys only when the PW#1 is turned on. +*/ +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) + id =HSW_DISP_PW_GLOBAL ; +else + id =SKL_DISP_PW_1 ; + +mutex_lock (&power_domains->lock); + +/* PG1 (power well #1) needs to be enabled */ +for_each_power_well (dev_priv, power_well) { +if (power_well->id == id) { + enabled = power_well->ops->is_enabled (dev_priv, + power_well); +break ; + } + } +mutex_unlock (&power_domains->lock); + +/* +* Another req for hdcp key loadability is enabled state of pll for +* cdclk. Without active crtc we wont land here. So we are assuming that +* cdclk is already on. +*/ + +return enabled; +} +static void intel_hdcp_clear_keys (struct drm_i915_private *dev_priv) {I915_WRITE (HDCP_KEY_CONF ,HDCP_CLEAR_KEYS_TRIGGER );@@ -615,8 +652,8 @@ static int _intel_hdcp_enable(struct intel_connector *connector)DRM_DEBUG_KMS ("[%s:%d] HDCP is being enabled...\n" , connector->base.name, connector->base.base.id);Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c static int _intel_hdcp_enable(struct intel_connector *connector) · line 658
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-2-if (!(I915_READ (SKL_FUSE_STATUS ) &SKL_FUSE_PG_DIST_STATUS (1 ))) { -DRM_ERROR ("PG1 is disabled, cannot load keys\n" ); +if (!hdcp_key_loadable (dev_priv)) { +DRM_ERROR ("HDCP key Load is not possible\n" );return -ENXIO ; }If you need the power well then why aren't you grabbing the correct power domain reference somewhere?
Ville,
As HDCP is supposed to be enabled after the basic display is up, power well #1 is supposed to be enabled. If not that is mostly an error w.r.t HDCP.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
So at this point we just want to verify whether required PW is up and HDCP key can be loaded from the HW. Else fail the HDCP request.
So this is in practice dead code to deal with a hypothetical bug elsewhere in the driver?
Yeah looks like it should be wrapped in a
WARN_ON, or maybe outright thrown out. The unclaimed mmio debug stuff will catch when this happens (or well, should).
-Daniel
Ok. Intention of this patch was generalizing the existing SKL specific PW check for all hdcp capable intel platforms. Please suggest if this needs to be wrapped into WARN_ON or really want to discard it.
--Ram
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 3/4] drm/i915: Check hdcp key loadability
Quoted 89 lines · Ramalingam C
Quoted 86 lines · Daniel Vetter
Quoted 85 lines · Ville Syrjälä
Quoted 76 lines · Ramalingam C
Quoted 66 lines · Ville Syrjälä
Quoted 65 lines · Ramalingam C
HDCP1.4 key can be loaded, only when Power well #1 is enabled and cdclk is enabled. Using the I915 power well infrastruture, above requirement is verified.
This patch enables the hdcp initialization for HSW, BDW, and BXT.
v2:
Choose the PW# based on the platform.Signed-off-by Ramalingam C <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/i915/intel_hdcp.c | 41 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_hdcp.c +37
-0@@ -37,6 +37,43 @@ static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,return 0 ; } +static bool hdcp_key_loadable (struct drm_i915_private *dev_priv) +{ +struct i915_power_domains *power_domains = &dev_priv->power_domains; +struct i915_power_well *power_well; +enum i915_power_well_id id; +bool enabled = false; + +/* +* On HSW and BDW, Display HW loads the Key as soon as Display resumes. +* On all BXT+, SW can load the keys only when the PW#1 is turned on. +*/ +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) + id =HSW_DISP_PW_GLOBAL ; +else + id =SKL_DISP_PW_1 ; + +mutex_lock (&power_domains->lock); + +/* PG1 (power well #1) needs to be enabled */ +for_each_power_well (dev_priv, power_well) { +if (power_well->id == id) { + enabled = power_well->ops->is_enabled (dev_priv, + power_well); +break ; + } + } +mutex_unlock (&power_domains->lock); + +/* +* Another req for hdcp key loadability is enabled state of pll for +* cdclk. Without active crtc we wont land here. So we are assuming that +* cdclk is already on. +*/ + +return enabled; +} +static void intel_hdcp_clear_keys (struct drm_i915_private *dev_priv) {I915_WRITE (HDCP_KEY_CONF ,HDCP_CLEAR_KEYS_TRIGGER );@@ -615,8 +652,8 @@ static int _intel_hdcp_enable(struct intel_connector *connector)DRM_DEBUG_KMS ("[%s:%d] HDCP is being enabled...\n" , connector->base.name, connector->base.base.id);Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c static int _intel_hdcp_enable(struct intel_connector *connector) · line 658
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-2-if (!(I915_READ (SKL_FUSE_STATUS ) &SKL_FUSE_PG_DIST_STATUS (1 ))) { -DRM_ERROR ("PG1 is disabled, cannot load keys\n" ); +if (!hdcp_key_loadable (dev_priv)) { +DRM_ERROR ("HDCP key Load is not possible\n" );return -ENXIO ; }If you need the power well then why aren't you grabbing the correct power domain reference somewhere?
Quoted 6 lines
Ville,
As HDCP is supposed to be enabled after the basic display is up, power well #1 is supposed to be enabled. If not that is mostly an error w.r.t HDCP.
So at this point we just want to verify whether required PW is up and HDCP key can be loaded from the HW. Else fail the HDCP request.
So this is in practice dead code to deal with a hypothetical bug elsewhere in the driver?
Quoted 8 lines
Quoted 4 lines
Yeah looks like it should be wrapped in a
WARN_ON, or maybe outright thrown out. The unclaimed mmio debug stuff will catch when this happens (or well, should).
-DanielOk. Intention of this patch was generalizing the existing SKL specific PW check for all hdcp capable intel platforms.
Please suggest if this needs to be wrapped intoWARN_ONor really want to discard it.
That's not what the commit message says, and since you replace a check for a fuse register with driver-internal checks for power well state, also not what the diff looks like.
In general, we don't do runtime checks for power wells (except for boot-time display state readout, but that's the only case). Instead you need to make sure you're holding the right power well references while using something. Not just while the key is loaded, but the entire time it's in use.
So not really sure what you should be doing, except most likely not this patch here.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/4 drm/i915: Fix downstream dev count read
In reply to Ramalingam CIn both HDMI and DP, device count is represented by 6:0 bits of a register(BInfo/Bstatus)
So macro for bitmasking the device_count is fixed(0x3F->0x7F).
--- include/drm/drm_hdcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/drm_hdcp.h +1 -1
@@ -19,7 +19,7 @@#define DRM_HDCP_RI_LEN 2#define DRM_HDCP_V_PRIME_PART_LEN 4#define DRM_HDCP_V_PRIME_NUM_PARTS 5 -#define DRM_HDCP_NUM_DOWNSTREAM (x) (x & 0x3f) +#define DRM_HDCP_NUM_DOWNSTREAM (x) (x & 0x7f)#define DRM_HDCP_MAX_CASCADE_EXCEEDED (x) (x & BIT(3))#define DRM_HDCP_MAX_DEVICE_EXCEEDED (x) (x & BIT(7))
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 4/4] drm/i915: Fix downstream dev count read
Quoted 5 lines · Ramalingam C
In both HDMI and DP, device count is represented by 6:0 bits of a register(BInfo/Bstatus)
So macro for bitmasking the
device_countisfixed(0x3F->0x7F).
Quoted 22 lines
Signed-off-by Ramalingam C <[email protected]>cc Sean Paul <[email protected]>--- include/drm/drm_hdcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/drm/drm_hdcp.h +1
-1@@ -19,7 +19,7 @@#define DRM_HDCP_RI_LEN 2#define DRM_HDCP_V_PRIME_PART_LEN 4#define DRM_HDCP_V_PRIME_NUM_PARTS 5 -#define DRM_HDCP_NUM_DOWNSTREAM (x) (x & 0x3f) +#define DRM_HDCP_NUM_DOWNSTREAM (x) (x & 0x7f)#define DRM_HDCP_MAX_CASCADE_EXCEEDED (x) (x & BIT(3))#define DRM_HDCP_MAX_DEVICE_EXCEEDED (x) (x & BIT(7))Signature · 1 line
2.7.4
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 8 lines · Ramalingam C
First two patches needed for below DP HDCP compliance tests
1A-06 and 1B-05Third patch fixes the HDCP1.4 Key loadability check. where as fourth one fixes the downstream device count read.
Fix for HDMI HDCP1.4 CTS tests: 1A-04 and 1A-07a are functional. But the change from v2, as thinking to put through more regressive
The change is removed from v2*
All other changes are well tested on KBL.
--Ram
Quoted 8 lines
testing before upstreaming.
Ramalingam C (4):
drm/i915: Read HDCP R0 thrice in case of mismatch drm/i915: Read Vprime thrice incase of mismatch drm/i915: Check hdcp key loadability drm/i915: Fix downstream dev count read
Quoted 4 lines
drivers/gpu/drm/i915/intel_hdcp.c | 184 ++++++++++++++++++++++++++------------ include/drm/drm_hdcp.h | 2 +- 2 files changed, 129 insertions(+), 57 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✓ Fi.CI.BAT: success for HDCP1.4 fixes (rev3)
In reply to Ramalingam C== Series Details ==
== Series Details ==
Series: HDCP1.4 fixes (rev3)
URL : https://patchwork.freedesktop.org/series/38978/
State : success
== Summary ==
Series 38978v3 HDCP1.4 fixes
https://patchwork.freedesktop.org/api/1.0/series/38978/revisions/3/mbox/
---- Known issues:
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-b-frame-sequence:
fail -> PASS (fi-cfl-s3) fdo#103481fdo#103481 https://bugs.freedesktop.org/show_bug.cgi?id=103481
fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:430s fi-bdw-gvtdvm total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:443s fi-blb-e6850 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:385s fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:543s fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:296s fi-bxt-dsi total:285 pass:255 dwarn:0 dfail:0 fail:0 skip:30 time:516s fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:513s fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:518s fi-byt-n2820 total:285 pass:246 dwarn:0 dfail:0 fail:0 skip:39 time:507s fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:409s fi-cfl-s3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:560s fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:512s fi-cnl-y3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:588s fi-elk-e7500 total:285 pass:225 dwarn:1 dfail:0 fail:0 skip:59 time:424s fi-gdg-551 total:285 pass:176 dwarn:0 dfail:0 fail:1 skip:108 time:319s fi-glk-1 total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:539s fi-hsw-4770 total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:404s fi-ilk-650 total:285 pass:225 dwarn:0 dfail:0 fail:0 skip:60 time:422s fi-ivb-3520m total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:477s fi-ivb-3770 total:285 pass:252 dwarn:0 dfail:0 fail:0 skip:33 time:434s fi-kbl-7500u total:285 pass:260 dwarn:1 dfail:0 fail:0 skip:24 time:473s fi-kbl-7567u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:459s fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:508s fi-pnv-d510 total:285 pass:219 dwarn:1 dfail:0 fail:0 skip:65 time:659s fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:439s fi-skl-6600u total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:528s fi-skl-6700k2 total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:500s fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:506s fi-skl-guc total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:432s fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:445s fi-snb-2600 total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:400s Blacklisted hosts: fi-cnl-psr total:285 pass:256 dwarn:3 dfail:0 fail:0 skip:26 time:542s fi-glk-j4005 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:485s
d6e43ca115e525e6d53539be28100d2ee0958655 drm-tip: 2018y-03m-29d-12h-46m-03s UTC integration manifest 09c85a8e205c drm/i915: Fix downstream dev count reade0351b8ec3e2 drm/i915: Check hdcp key loadabilityf0df339306d6 drm/i915: Read Vprime thrice incase of mismatchdcb5fbdd94a2 drm/i915: Read HDCP R0 thrice in case of mismatch
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8535/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for HDCP1.4 fixes (rev3)
In reply to Ramalingam C== Series Details ==
== Series Details ==
Series: HDCP1.4 fixes (rev3)
URL : https://patchwork.freedesktop.org/series/38978/
State : failure
== Summary ==
---- Possible new issues:
Test drv_selftest:
Subgroup live_hangcheck:
pass -> DMESG-FAIL (shard-apl)---- Known issues:
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-primscrn-cur-indfb-draw-blt:
pass -> FAIL (shard-apl) fdo#103167
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
incomplete -> PASS (shard-hsw) fdo#103375
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-apl total:3495 pass:1829 dwarn:1 dfail:1 fail:8 skip:1655 time:12911s shard-hsw total:3495 pass:1782 dwarn:1 dfail:0 fail:2 skip:1709 time:11414s shard-snb total:3495 pass:1374 dwarn:1 dfail:0 fail:3 skip:2117 time:7041s
Blacklisted hosts:
shard-kbl total:3495 pass:1953 dwarn:6 dfail:0 fail:8 skip:1528 time:9333s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8535/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx