Enabling the IGT for HDCP1.4
Subsystems (2)
cover Enabling the IGT for HDCP1.4
Adding a debugfs entry for detecting the valid HDCP sinks to perform kms_content_protection.
In case of dummy HDMI/DP sinks(EDID whisperers without any parsers) IGT will skip the HDCP test on that connector instead of failing it. Hence false alarm are avoided.
For serving above purpose this series has pulled out few changes from "Implement HDCP2.2" series under review at
https://patchwork.freedesktop.org/series/38254/
"drm/i915: hdcp_check_link only on CP_IRQ" is just a improvement patch for HDCP1.4. Already received the reviewed-by from Sean Paul.
Ramalingam C (4):
drm/i915: Pullout the bksv read and validation drm/i915: Detect the hdcp capability of sink and src drm/i915: hdcp_check_link only on CP_IRQ drm/i915/debugfs: sinks hdcp capabilities
drivers/gpu/drm/i915/i915_debugfs.c | 31 ++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 10 ++-- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdcp.c | 95 +++++++++++++++++++++++++------------ 4 files changed, 102 insertions(+), 35 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/4 drm/i915: Pullout the bksv read and validation
For reusability purpose, this patch implements the hdcp1.4 bksv's read and validation as a functions.
For detecting the HDMI panel's HDCP capability this fucntions will be used.
v2:
Rebased.
v3:
No Changes.
v4:
inline tag is removed with modified error msg.
v5:
No Changes.
v6:
No Changes.
v7:
Realigned the code.
--- drivers/gpu/drm/i915/intel_hdcp.c | 62 ++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/intel_hdcp.c +38 -24
@@ -16,6 +16,41 @@#define KEY_LOAD_TRIES 5 +static +bool intel_hdcp_is_ksv_valid (u8 *ksv) +{ +int i, ones =0 ; +/* KSV has 20 1's and 20 0's */ +for (i =0 ; i <DRM_HDCP_KSV_LEN ; i++) + ones +=hweight8 (ksv[i]); +if (ones !=20 ) +return false; + +return true; +} + +static +int intel_hdcp_read_valid_bksv (struct intel_digital_port *intel_dig_port, +const struct intel_hdcp_shim *shim,u8 *bksv) +{ +int ret, i, tries =2 ; + +/* HDCP spec states that we must retry the bksv if it is invalid */ +for (i =0 ; i < tries; i++) { + ret = shim->read_bksv (intel_dig_port, bksv); +if (ret) +return ret; +if (intel_hdcp_is_ksv_valid (bksv)) +break ; + } +if (i == tries) { +DRM_ERROR ("Bksv is invalid\n" ); +return -ENODEV ; + } + +return 0 ; +} +static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port,const struct intel_hdcp_shim *shim) {
@@ -168,18 +203,6 @@ u32 intel_hdcp_get_repeater_ctl(struct intel_digital_port *intel_dig_port) }static -bool intel_hdcp_is_ksv_valid (u8 *ksv) -{ -int i, ones =0 ; -/* KSV has 20 1's and 20 0's */ -for (i =0 ; i <DRM_HDCP_KSV_LEN ; i++) - ones +=hweight8 (ksv[i]); -if (ones !=20 ) -return false; -return true; -} - -static 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)
@@ -527,18 +550,9 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port,memset (&bksv,0 ,sizeof (bksv)); -/* HDCP spec states that we must retry the bksv if it is invalid */ -for (i =0 ; i < tries; i++) { - ret = shim->read_bksv (intel_dig_port, bksv.shim); -if (ret) -return ret; -if (intel_hdcp_is_ksv_valid (bksv.shim)) -break ; - } -if (i == tries) { -DRM_ERROR ("HDCP failed, Bksv is invalid\n" ); -return -ENODEV ; - } + ret =intel_hdcp_read_valid_bksv (intel_dig_port, shim, bksv.shim); +if (ret <0 ) +return ret;I915_WRITE (PORT_HDCP_BKSVLO (port), bksv.reg[0 ]);I915_WRITE (PORT_HDCP_BKSVHI (port), bksv.reg[1 ]);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/4 drm/i915: Detect the hdcp capability of sink and src
In reply to Ramalingam CImplements a function to detect the sink and src's hdcp1.4 capabilities.
--- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdcp.c | 33 +++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1956,6 +1956,7 @@ int intel_hdcp_enable(struct intel_connector *connector);int intel_hdcp_disable (struct intel_connector *connector);int intel_hdcp_check_link (struct intel_connector *connector);bool is_hdcp_supported (struct drm_i915_private *dev_priv,enum port port); +bool intel_hdcp_capable (struct intel_connector *connector);/* intel_psr.c */ #define CAN_PSR (dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support)
drivers/gpu/drm/i915/intel_hdcp.c +27 -6
@@ -17,6 +17,12 @@#define KEY_LOAD_TRIES 5static +struct intel_digital_port *conn_to_dig_port (struct intel_connector *connector) +{ +return enc_to_dig_port (&intel_attached_encoder (&connector->base)->base); +} + +static bool intel_hdcp_is_ksv_valid (u8 *ksv) {int i, ones =0 ;
@@ -51,6 +57,27 @@ int intel_hdcp_read_valid_bksv(struct intel_digital_port *intel_dig_port,return 0 ; } +/* Is HDCP1.4 capable on Platform and Sink */ +bool intel_hdcp_capable (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp_shim *shim = connector->hdcp_shim; +bool capable = false; +u8 bksv[5 ]; + +if (!shim) +return capable; + +if (shim->hdcp_capable) { + shim->hdcp_capable (intel_dig_port, &capable); + }else { +if (!intel_hdcp_read_valid_bksv (intel_dig_port, shim, bksv)) + capable = true; + } + +return capable; +} +static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port,const struct intel_hdcp_shim *shim) {
@@ -632,12 +659,6 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port,return 0 ; } -static -struct intel_digital_port *conn_to_dig_port (struct intel_connector *connector) -{ -return enc_to_dig_port (&intel_attached_encoder (&connector->base)->base); -} -static int _intel_hdcp_disable (struct intel_connector *connector) {struct drm_i915_private *dev_priv = connector->base.dev->dev_private;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/4 drm/i915: Detect the hdcp capability of sink and src
Implements a function to detect the sink and src's hdcp1.4 capabilities.
v2:
const qualifier is maintained at init.
--- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdcp.c | 33 +++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1956,6 +1956,7 @@ int intel_hdcp_enable(struct intel_connector *connector);int intel_hdcp_disable (struct intel_connector *connector);int intel_hdcp_check_link (struct intel_connector *connector);bool is_hdcp_supported (struct drm_i915_private *dev_priv,enum port port); +bool intel_hdcp_capable (struct intel_connector *connector);/* intel_psr.c */ #define CAN_PSR (dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support)
drivers/gpu/drm/i915/intel_hdcp.c +27 -6
@@ -17,6 +17,12 @@#define KEY_LOAD_TRIES 5static +struct intel_digital_port *conn_to_dig_port (struct intel_connector *connector) +{ +return enc_to_dig_port (&intel_attached_encoder (&connector->base)->base); +} + +static bool intel_hdcp_is_ksv_valid (u8 *ksv) {int i, ones =0 ;
@@ -51,6 +57,27 @@ int intel_hdcp_read_valid_bksv(struct intel_digital_port *intel_dig_port,return 0 ; } +/* Is HDCP1.4 capable on Platform and Sink */ +bool intel_hdcp_capable (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +const struct intel_hdcp_shim *shim = connector->hdcp_shim; +bool capable = false; +u8 bksv[5 ]; + +if (!shim) +return capable; + +if (shim->hdcp_capable) { + shim->hdcp_capable (intel_dig_port, &capable); + }else { +if (!intel_hdcp_read_valid_bksv (intel_dig_port, shim, bksv)) + capable = true; + } + +return capable; +} +static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port,const struct intel_hdcp_shim *shim) {
@@ -632,12 +659,6 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port,return 0 ; } -static -struct intel_digital_port *conn_to_dig_port (struct intel_connector *connector) -{ -return enc_to_dig_port (&intel_attached_encoder (&connector->base)->base); -} -static int _intel_hdcp_disable (struct intel_connector *connector) {struct drm_i915_private *dev_priv = connector->base.dev->dev_private;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/4 drm/i915: hdcp_check_link only on CP_IRQ
In reply to Ramalingam CHDCP check link is invoked only on CP_IRQ detection, instead of all short pulses.
v3:
No Changes.
v4:
Added sean in cc and collected the reviewed-by received.
v5:
No Change.
v6:
No Change.
v7:
No Change.
v8:
Rebased.
--- drivers/gpu/drm/i915/intel_dp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +5 -5
@@ -4530,8 +4530,11 @@ static void intel_dp_check_service_irq(struct intel_dp *intel_dp)if (val &DP_AUTOMATED_TEST_REQUEST )intel_dp_handle_test_request (intel_dp); -if (val & (DP_CP_IRQ |DP_SINK_SPECIFIC_IRQ )) -DRM_DEBUG_DRIVER ("CP or sink specific irq unhandled\n" ); +if (val &DP_CP_IRQ ) +intel_hdcp_check_link (intel_dp->attached_connector); + +if (val &DP_SINK_SPECIFIC_IRQ ) +DRM_DEBUG_DRIVER ("Sink specific irq unhandled\n" ); }/*
@@ -5694,9 +5697,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) handled =intel_dp_short_pulse (intel_dp); -/* Short pulse can signify loss of hdcp authentication */ -intel_hdcp_check_link (intel_dp->attached_connector); -if (!handled) goto put_power; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/4 drm/i915/debugfs: sinks hdcp capabilities
In reply to Ramalingam Cdebugfs entry for providing the hdcp capabilities of the sinks connected to the HDCP capable connectors.
--- drivers/gpu/drm/i915/i915_debugfs.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +31 -0
@@ -2210,6 +2210,36 @@ static const char *rps_power_to_str(unsigned int power)return strings[power]; } +static int i915_sinks_hdcp_capabilities (struct seq_file *m,void *unused) +{ +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm; +struct intel_connector *connector; +struct drm_connector_list_iter conn_iter; +bool is_hdcp14; + +drm_connector_list_iter_begin (dev, &conn_iter); +for_each_intel_connector_iter (connector, &conn_iter) { +if (connector->base.status != connector_status_connected) +continue ; + +/* HDCP is supported by connector */ +if (!connector->hdcp_shim) +continue ; + +/* Detect sink's HDCP1.4 capability */ + is_hdcp14 =intel_hdcp_capable (connector); + +seq_printf (m,"%s:%d HDCP version: " , connector->base.name, + connector->base.base.id); +seq_printf (m,"%s " , !is_hdcp14 ?"None" :"HDCP1.4" ); +seq_puts (m,"\n" ); + } +drm_connector_list_iter_end (&conn_iter); + +return 0 ; +} +static int i915_rps_boost_info (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);
@@ -4805,6 +4835,7 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_sseu_status", i915_sseu_status, 0}, {"i915_drrs_status", i915_drrs_status, 0}, {"i915_rps_boost_info", i915_rps_boost_info, 0}, + {"i915_sinks_hdcp_capabilities", i915_sinks_hdcp_capabilities, 0}, };#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Enabling the IGT for HDCP1.4
In reply to Ramalingam C== Series Details ==
== Series Details ==
Series: Enabling the IGT for HDCP1.4
URL : https://patchwork.freedesktop.org/series/51113/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
DESCEND objtool
CHK include/generated/compile.h
CC [M] drivers/gpu/drm/i915/intel_hdcp.odrivers/gpu/drm/i915/intel_hdcp.c: In function ‘intel_hdcp_capable’:drivers/gpu/drm/i915/intel_hdcp.c:64:33: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
struct intel_hdcp_shim *shim = connector->hdcp_shim;
^~~~~~~~~cc1: all warnings being treated as errorsscripts/Makefile.build:305: recipe for target 'drivers/gpu/drm/i915/intel_hdcp.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_hdcp.o] Error 1 scripts/Makefile.build:546: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:546: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:546: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:1052: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Enabling the IGT for HDCP1.4 (rev2)
In reply to Ramalingam C== Series Details ==
== Series Details ==
Series: Enabling the IGT for HDCP1.4 (rev2)
URL : https://patchwork.freedesktop.org/series/51113/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4996 -> Patchwork_10489 =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_10489 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10489, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51113/revisions/2/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10489:
=== IGT changes ===
==== Possible regressions ====
igt@debugfs_test@read_all_entries:
fi-skl-iommu: PASS -> DMESG-WARN
fi-icl-u2: PASS -> DMESG-WARN
fi-bdw-5557u: PASS -> DMESG-WARN
fi-skl-guc: PASS -> DMESG-WARN
fi-glk-j4005: PASS -> DMESG-WARN
fi-cfl-8700k: PASS -> DMESG-WARN
fi-cfl-guc: PASS -> DMESG-WARN== Known issues ==
Here are the changes found in Patchwork_10489 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s3:
fi-blb-e6850: PASS -> INCOMPLETE (fdo#107718)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-skl-6700k2: PASS -> INCOMPLETE (fdo#105524, fdo#104108, k.org#199541)
==== Possible fixes ====
igt@drv_selftest@live_evict:
fi-bsw-kefka: DMESG-WARN (fdo#107709) -> PASS
igt@gem_exec_suspend@basic-s3:
fi-icl-u: INCOMPLETE (fdo#107713) -> PASS fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#105524 https://bugs.freedesktop.org/show_bug.cgi?id=105524
fdo#107709 https://bugs.freedesktop.org/show_bug.cgi?id=107709
fdo#107713 https://bugs.freedesktop.org/show_bug.cgi?id=107713
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
k.org#199541 https://bugzilla.kernel.org/show_bug.cgi?id=199541
== Participating hosts (46 -> 40) ==
Additional (1): fi-pnv-d510
Missing (7): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-apl-guc fi-kbl-7560u
== Build changes ==
* Linux: CI_DRM_4996 -> Patchwork_10489
CI_DRM_4996: 3e17cf0ad3733a3d67045393727066bbd011b69d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4683: 7766b1e2348b32cc8ed58a972c6fd53b20279549 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10489: 2ff23417eff1eac516483734a849ef6cd66087ad @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
2ff23417eff1 drm/i915/debugfs: sinks hdcp capabilities ec4e94da3fb4 drm/i915: hdcp_check_link only on CP_IRQ d67eef5dae72 drm/i915: Detect the hdcp capability of sink and src 36a7205c44aa drm/i915: Pullout the bksv read and validation
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10489/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx