HDCP 2.2 and HDCP 1.4 Gen12 DP MST support
Subsystems (6)
v5 cover HDCP 2.2 and HDCP 1.4 Gen12 DP MST support
This is v5 version to test with IGT https://patchwork.freedesktop.org/series/82987/
This has addressed the review comments from Ram.
It has been also tested manually with above IGT series.
[PATCH v5 11/17] misc/mei/hdcp: Fix AUTH_STREAM_REQ cmd buffer len has an Ack from Tomas to merge it via drm-intel.
[PATCH v5 12/17] drm/hdcp: Max MST content streams has an Ack from drm-misc maintainer to merge it via drm-intel.
Test-with: [email protected]
Anshuman Gupta (17):
drm/i915/hdcp: Update CP property in update_pipe drm/i915/hdcp: Get conn while content_type changed drm/i915/hotplug: Handle CP_IRQ for DP-MST drm/i915/hdcp: DP MST transcoder for link and stream drm/i915/hdcp: Move HDCP enc status timeout to header drm/i915/hdcp: HDCP stream encryption support drm/i915/hdcp: Enable HDCP 1.4 stream encryption drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support drm/i915/hdcp: Pass dig_port to intel_hdcp_init drm/i915/hdcp: Encapsulate hdcp_port_data to dig_port misc/mei/hdcp: Fix AUTH_STREAM_REQ cmd buffer len drm/hdcp: Max MST content streams drm/i915/hdcp: MST streams support in hdcp port_data drm/i915/hdcp: Pass connector to check_2_2_link drm/i915/hdcp: Add HDCP 2.2 stream register drm/i915/hdcp: Support for HDCP 2.2 MST shim callbacks drm/i915/hdcp: Enable HDCP 2.2 MST support
drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_ddi.h | 6 +- .../drm/i915/display/intel_display_types.h | 20 +- drivers/gpu/drm/i915/display/intel_dp.c | 14 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 182 +++++++++-- drivers/gpu/drm/i915/display/intel_dp_mst.c | 12 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 294 ++++++++++++++---- drivers/gpu/drm/i915/display/intel_hdcp.h | 8 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 19 +- drivers/gpu/drm/i915/i915_reg.h | 31 ++ drivers/misc/mei/hdcp/mei_hdcp.c | 3 +- include/drm/drm_hdcp.h | 8 +- 12 files changed, 489 insertions(+), 122 deletions(-)
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 1/17 drm/i915/hdcp: Update CP property in update_pipe
When crtc state need_modeset is true it is not necessary it is going to be a real modeset, it can turns to be a fastset instead of modeset.
This turns content protection property to be DESIRED and hdcp update_pipe left with property to be in DESIRED state but actual hdcp->value was ENABLED.
This issue is caught with DP MST setup, where we have multiple connector in same DP_MST topology. When disabling HDCP on one of DP MST connector leads to set the crtc state need_modeset to true for all other crtc driving the other DP-MST topology connectors. This turns up other DP MST connectors CP property to be DESIRED despite the actual hdcp->value is ENABLED.
Above scenario fails the DP MST HDCP IGT test, disabling HDCP on one MST stream should not cause to disable HDCP on another MST stream on same DP MST topology.
v2:
Fix WARN_ON(connector->base.registration_state == DRM_CONNECTOR_REGISTERED) v3:
Commit log improvement. [Uma]
Added a comment before scheduling prop_work. [Uma]
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/display/intel_hdcp.c +8 -0
@@ -2221,6 +2221,14 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state, desired_and_not_enabled = hdcp->value !=DRM_MODE_CONTENT_PROTECTION_ENABLED ;mutex_unlock (&hdcp->mutex); +/* +* If HDCP already ENABLED and CP property is DESIRED, schedule +* prop_work to update correct CP property to user space. +*/ +if (!desired_and_not_enabled && !content_protection_type_changed) { +drm_connector_get (&connector->base); +schedule_work (&hdcp->prop_work); + } }if (desired_and_not_enabled || content_protection_type_changed)
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 2/17 drm/i915/hdcp: Get conn while content_type changed
In reply to Anshuman GuptaGet DRM connector reference count while scheduling a prop work to avoid any possible destroy of DRM connector when it is in DRM_CONNECTOR_REGISTERED state.
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/display/intel_hdcp.c +1 -0
@@ -2210,6 +2210,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,if (content_protection_type_changed) {mutex_lock (&hdcp->mutex); hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ; +drm_connector_get (&connector->base);schedule_work (&hdcp->prop_work);mutex_unlock (&hdcp->mutex); }
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 3/17 drm/i915/hotplug: Handle CP_IRQ for DP-MST
In reply to Anshuman GuptaHandle CP_IRQ in DEVICE_SERVICE_IRQ_VECTOR_ESI0 It requires to call intel_hdcp_handle_cp_irq() in case of CP_IRQ is triggered by a sink in DP-MST topology.
--- drivers/gpu/drm/i915/display/intel_dp.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_dp.c +13 -1
@@ -5711,6 +5711,17 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) "Could not write test response to sink\n"); } +static void +intel_dp_mst_hpd_irq (struct intel_dp *intel_dp,u8 *esi,bool *handled) +{ +drm_dp_mst_hpd_irq (&intel_dp->mst_mgr, esi, handled); + +if (esi[1 ] &DP_CP_IRQ ) { +intel_hdcp_handle_cp_irq (intel_dp->attached_connector); + *handled = true; + } +} +/** * intel_dp_check_mst_status - service any pending MST interrupts, check link status * @intel_dp: Intel DP struct
@@ -5755,7 +5766,8 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)drm_dbg_kms (&i915->drm,"got esi %3ph\n" , esi); -drm_dp_mst_hpd_irq (&intel_dp->mst_mgr, esi, &handled); +intel_dp_mst_hpd_irq (intel_dp, esi, &handled); +if (!handled)break ;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 4/17 drm/i915/hdcp: DP MST transcoder for link and stream
In reply to Anshuman GuptaGen12 has H/W delta with respect to HDCP{1.x,2.x} display engine instances lies in Transcoder instead of DDI as in Gen11.
This requires hdcp driver to use mst_master_transcoder for link authentication and stream transcoder for stream encryption separately.
This will be used for both HDCP 1.4 and HDCP 2.2 over DP MST on Gen12.
--- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- .../gpu/drm/i915/display/intel_display_types.h | 2 ++ drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 15 +++++++++++---- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +1 -1
@@ -4059,7 +4059,7 @@ static void intel_enable_ddi(struct intel_atomic_state *state,if (conn_state->content_protection ==DRM_MODE_CONTENT_PROTECTION_DESIRED )intel_hdcp_enable (to_intel_connector (conn_state->connector), - crtc_state->cpu_transcoder, + crtc_state, (u8 )conn_state->hdcp_content_type); }
drivers/gpu/drm/i915/display/intel_display_types.h +2 -0
@@ -432,6 +432,8 @@ struct intel_hdcp {* Hence caching the transcoder here. */ enum transcoder cpu_transcoder; +/* Only used for DP MST stream encryption */ +enum transcoder stream_transcoder; };struct intel_connector {
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -1
@@ -568,7 +568,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,if (conn_state->content_protection ==DRM_MODE_CONTENT_PROTECTION_DESIRED )intel_hdcp_enable (to_intel_connector (conn_state->connector), - pipe_config->cpu_transcoder, + pipe_config, (u8 )conn_state->hdcp_content_type); }
drivers/gpu/drm/i915/display/intel_hdcp.c +11 -4
@@ -2095,7 +2095,7 @@ int intel_hdcp_init(struct intel_connector *connector, }int intel_hdcp_enable (struct intel_connector *connector, -enum transcoder cpu_transcoder,u8 content_type) +const struct intel_crtc_state *pipe_config,u8 content_type) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_digital_port *dig_port =intel_attached_dig_port (connector);
@@ -2111,10 +2111,17 @@ int intel_hdcp_enable(struct intel_connector *connector,drm_WARN_ON (&dev_priv->drm, hdcp->value ==DRM_MODE_CONTENT_PROTECTION_ENABLED ); hdcp->content_type = content_type; - hdcp->cpu_transcoder = cpu_transcoder; + +if (intel_crtc_has_type (pipe_config,INTEL_OUTPUT_DP_MST )) { + hdcp->cpu_transcoder = pipe_config->mst_master_transcoder; + hdcp->stream_transcoder = pipe_config->cpu_transcoder; + }else { + hdcp->cpu_transcoder = pipe_config->cpu_transcoder; + hdcp->stream_transcoder =INVALID_TRANSCODER ; + }if (INTEL_GEN (dev_priv) >=12 ) - hdcp->port_data.fw_tc =intel_get_mei_fw_tc (cpu_transcoder); + hdcp->port_data.fw_tc =intel_get_mei_fw_tc (hdcp->cpu_transcoder);/* * Considering that HDCP2.2 is more secure than HDCP1.4, If the setup
@@ -2234,7 +2241,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,if (desired_and_not_enabled || content_protection_type_changed)intel_hdcp_enable (connector, - crtc_state->cpu_transcoder, + crtc_state, (u8 )conn_state->hdcp_content_type); }
drivers/gpu/drm/i915/display/intel_hdcp.h +1 -1
@@ -25,7 +25,7 @@ void intel_hdcp_atomic_check(struct drm_connector *connector,int intel_hdcp_init (struct intel_connector *connector,enum port port,const struct intel_hdcp_shim *hdcp_shim);int intel_hdcp_enable (struct intel_connector *connector, -enum transcoder cpu_transcoder,u8 content_type); +const struct intel_crtc_state *pipe_config,u8 content_type);int intel_hdcp_disable (struct intel_connector *connector); void intel_hdcp_update_pipe(struct intel_atomic_state *state, struct intel_encoder *encoder,
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 5/17 drm/i915/hdcp: Move HDCP enc status timeout to header
In reply to Anshuman GuptaDP MST stream encryption status requires time of a link frame in order to change its status, but as there were some HDCP encryption timeout observed earlier, it is safer to use ENCRYPT_STATUS_CHANGE_TIMEOUT_MS timeout for stream status too, it requires to move the macro to a header.
It will be used by both HDCP{1.x,2.x} stream status timeout.
Related: 'commit 7e90e8d0c0ea ("drm/i915: Increase timeout for Encrypt status change")'
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 9 ++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +4 -5
@@ -23,7 +23,6 @@#include "intel_connector.h" #define KEY_LOAD_TRIES 5 -#define ENCRYPT_STATUS_CHANGE_TIMEOUT_MS 50#define HDCP2_LC_RETRY_CNT 3 static
@@ -762,7 +761,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)if (intel_de_wait_for_set (dev_priv,HDCP_STATUS (dev_priv, cpu_transcoder, port),HDCP_STATUS_ENC , -ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) { +HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) {drm_err (&dev_priv->drm,"Timed out waiting for encryption\n" );return -ETIMEDOUT ; }
@@ -809,7 +808,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector)intel_de_write (dev_priv,HDCP_CONF (dev_priv, cpu_transcoder, port),0 );if (intel_de_wait_for_clear (dev_priv,HDCP_STATUS (dev_priv, cpu_transcoder, port), - ~0 ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) { + ~0 ,HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) {drm_err (&dev_priv->drm,"Failed to disable HDCP, timeout clearing status\n" );return -ETIMEDOUT ;
@@ -1641,7 +1640,7 @@ static int hdcp2_enable_encryption(struct intel_connector *connector)HDCP2_STATUS (dev_priv, cpu_transcoder, port),LINK_ENCRYPTION_STATUS , - ENCRYPT_STATUS_CHANGE_TIMEOUT_MS); + HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS);return ret; }
@@ -1665,7 +1664,7 @@ static int hdcp2_disable_encryption(struct intel_connector *connector)HDCP2_STATUS (dev_priv, cpu_transcoder, port),LINK_ENCRYPTION_STATUS , - ENCRYPT_STATUS_CHANGE_TIMEOUT_MS); + HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS);if (ret == -ETIMEDOUT )drm_dbg_kms (&dev_priv->drm,"Disable Encryption Timedout" );
drivers/gpu/drm/i915/display/intel_hdcp.h +2 -0
@@ -8,6 +8,8 @@#include <linux/types.h> +#define HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS 50 +struct drm_connector ;struct drm_connector_state ;struct drm_i915_private ;
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 6/17 drm/i915/hdcp: HDCP stream encryption support
In reply to Anshuman GuptaBoth HDCP_{1.x,2.x} requires to select/deselect Multistream HDCP bit in TRANS_DDI_FUNC_CTL in order to enable/disable stream HDCP encryption over DP MST Transport Link.
HDCP 1.4 stream encryption requires to validate the stream encryption status in HDCP_STATUS_{TRANSCODER,PORT} register driving that link in order to enable/disable the stream encryption.
Both of above requirement are same for all Gen with respect to B.Spec Documentation.
v2:
Cosmetic changes function name, error msg print and stream typo fixes. [Uma]
--- drivers/gpu/drm/i915/display/intel_ddi.c | 10 +-- drivers/gpu/drm/i915/display/intel_ddi.h | 6 +- .../drm/i915/display/intel_display_types.h | 4 + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 86 ++++++++++++++++--- drivers/gpu/drm/i915/display/intel_hdmi.c | 14 +-- drivers/gpu/drm/i915/i915_reg.h | 1 + 6 files changed, 95 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +5 -5
@@ -1948,9 +1948,9 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state } } -int intel_ddi_toggle_hdcp_signalling (struct intel_encoder *intel_encoder, -enum transcoder cpu_transcoder, -bool enable) +int intel_ddi_toggle_hdcp_bits (struct intel_encoder *intel_encoder, +enum transcoder cpu_transcoder, +bool enable,u32 hdcp_mask) {struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -1965,9 +1965,9 @@ int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder, tmp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder));if (enable) - tmp |=TRANS_DDI_HDCP_SIGNALLING ; + tmp |= hdcp_mask;else - tmp &= ~TRANS_DDI_HDCP_SIGNALLING ; + tmp &= ~hdcp_mask;intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder), tmp);intel_display_power_put (dev_priv, intel_encoder->power_domain, wakeref);return ret;
drivers/gpu/drm/i915/display/intel_ddi.h +3 -3
@@ -50,9 +50,9 @@ u32 bxt_signal_levels(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state);u32 ddi_signal_levels (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state); -int intel_ddi_toggle_hdcp_signalling (struct intel_encoder *intel_encoder, -enum transcoder cpu_transcoder, -bool enable); +int intel_ddi_toggle_hdcp_bits (struct intel_encoder *intel_encoder, +enum transcoder cpu_transcoder, +bool enable,u32 hdcp_mask);void icl_sanitize_encoder_pll_mapping (struct intel_encoder *encoder);#endif /* __INTEL_DDI_H__ */
drivers/gpu/drm/i915/display/intel_display_types.h +4 -0
@@ -339,6 +339,10 @@ struct intel_hdcp_shim {enum transcoder cpu_transcoder, bool enable); +/* Enable/Disable stream encryption on DP MST Transport Link */ +int (*stream_encryption)(struct intel_connector *connector, +bool enable); +/* Ensures the link is still protected */ bool (*check_link)(struct intel_digital_port *dig_port,struct intel_connector *connector);
drivers/gpu/drm/i915/display/intel_dp_hdcp.c +74 -12
117 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_hdmi.c +8 -6
@@ -1495,15 +1495,16 @@ static int kbl_repositioning_enc_en_signal(struct intel_connector *connector,usleep_range (25 ,50 ); } - ret =intel_ddi_toggle_hdcp_signalling (&dig_port->base, cpu_transcoder, - false); + ret =intel_ddi_toggle_hdcp_bits (&dig_port->base, cpu_transcoder, + false,TRANS_DDI_HDCP_SIGNALLING );if (ret) {drm_err (&dev_priv->drm,"Disable HDCP signalling failed (%d)\n" , ret);return ret; } - ret =intel_ddi_toggle_hdcp_signalling (&dig_port->base, cpu_transcoder, - true); + + ret =intel_ddi_toggle_hdcp_bits (&dig_port->base, cpu_transcoder, + true,TRANS_DDI_HDCP_SIGNALLING );if (ret) {drm_err (&dev_priv->drm,"Enable HDCP signalling failed (%d)\n" , ret);
@@ -1526,8 +1527,9 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *dig_port,if (!enable)usleep_range (6 ,60 );/* Bspec says >= 6us */ - ret =intel_ddi_toggle_hdcp_signalling (&dig_port->base, cpu_transcoder, - enable); + ret =intel_ddi_toggle_hdcp_bits (&dig_port->base, + cpu_transcoder, enable, +TRANS_DDI_HDCP_SIGNALLING );if (ret) {drm_err (&dev_priv->drm,"%s HDCP signalling failed (%d)\n" , enable ?"Enable" :"Disable" , ret);
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -9958,6 +9958,7 @@ enum skl_power_gate {#define TRANS_DDI_DP_VC_PAYLOAD_ALLOC (1 << 8)#define TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE (1 << 7)#define TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ (1 << 6) +#define TRANS_DDI_HDCP_SELECT REG_BIT(5)#define TRANS_DDI_BFI_ENABLE (1 << 4)#define TRANS_DDI_HIGH_TMDS_CHAR_RATE (1 << 4)#define TRANS_DDI_HDMI_SCRAMBLING (1 << 0)
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 7/17 drm/i915/hdcp: Enable HDCP 1.4 stream encryption
In reply to Anshuman GuptaEnable HDCP 1.4 DP MST stream encryption.
Enable stream encryption once encryption is enabled on the DP transport driving the link for each stream which has requested encryption.
Disable stream encryption for each stream that no longer requires encryption before disabling HDCP encryption on the link.
v2:
- Added debug print for stream encryption.
- Disable the hdcp on port after disabling last stream encryption.
v3:
- Cosmetic change, removed the value less comment. [Uma] v4:
- Split the Gen12 HDCP enablement patch. [Ram]
- Add connector details in drm_err.
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 45 ++++++++++++++++------- 1 file changed, 31 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +31 -14
@@ -612,7 +612,12 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)return ret; } -/* Implements Part 1 of the HDCP authorization procedure */ +/* +* Implements Part 1 of the HDCP authorization procedure. +* Authentication Part 1 steps for Multi-stream DisplayPort. +* Step 1. Auth Part 1 sequence on the driving MST Trasport Link. +* Step 2. Enable encryption for each stream that requires encryption. +*/ static int intel_hdcp_auth (struct intel_connector *connector) {struct intel_digital_port *dig_port =intel_attached_dig_port (connector);
@@ -766,10 +771,17 @@ static int intel_hdcp_auth(struct intel_connector *connector)return -ETIMEDOUT ; } -/* -* XXX: If we have MST-connected devices, we need to enable encryption -* on those as well. -*/ +/* DP MST Auth Part 1 Step 2.a and Step 2.b */ +if (shim->stream_encryption) { + ret = shim->stream_encryption (connector, true); +if (ret) { +drm_err (&dev_priv->drm,"[CONNECTOR:%d:%s] Failed to enable HDCP 1.4 stream enc\n" , + connector->base.base.id, connector->base.name); +return ret; + } +drm_dbg_kms (&dev_priv->drm,"HDCP 1.4 transcoder: %s stream encrypted\n" , +transcoder_name (hdcp->stream_transcoder)); + }if (repeater_present)return intel_hdcp_auth_downstream (connector);
@@ -791,18 +803,23 @@ static int _intel_hdcp_disable(struct intel_connector *connector)drm_dbg_kms (&dev_priv->drm,"[%s:%d] HDCP is being disabled...\n" , connector->base.name, connector->base.base.id); +if (hdcp->shim->stream_encryption) { + ret = hdcp->shim->stream_encryption (connector, false); +if (ret) { +drm_err (&dev_priv->drm,"[CONNECTOR:%d:%s] Failed to disable HDCP 1.4 stream enc\n" , + connector->base.base.id, connector->base.name); +return ret; + } +drm_dbg_kms (&dev_priv->drm,"HDCP 1.4 transcoder: %s stream encryption disabled\n" , +transcoder_name (hdcp->stream_transcoder)); + } +/* -* If there are other connectors on this port using HDCP, don't disable -* it. Instead, toggle the HDCP signalling off on that particular -* connector/pipe and exit. +* If there are other connectors on this port using HDCP, don't disable it. +* Repeat steps 1-2 for each stream that no longer requires encryption. */ -if (dig_port->num_hdcp_streams >0 ) { - ret = hdcp->shim->toggle_signalling (dig_port, - cpu_transcoder, false); -if (ret) -DRM_ERROR ("Failed to disable HDCP signalling\n" ); +if (dig_port->num_hdcp_streams >0 )return ret; - } hdcp->hdcp_encrypted = false;intel_de_write (dev_priv,HDCP_CONF (dev_priv, cpu_transcoder, port),0 );
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v5 07/17] drm/i915/hdcp: Enable HDCP 1.4 stream encryption
Quoted 32 lines · Anshuman Gupta
Enable HDCP 1.4 DP MST stream encryption.
Enable stream encryption once encryption is enabled on the DP transport driving the link for each stream which has requested encryption.
Disable stream encryption for each stream that no longer requires encryption before disabling HDCP encryption on the link.
v2:
- Added debug print for stream encryption.
- Disable the hdcp on port after disabling last stream encryption.
v3:
- Cosmetic change, removed the value less comment. [Uma] v4:
- Split the Gen12 HDCP enablement patch. [Ram]
- Add connector details indrm_err.Cc Ramalingam C <[email protected]>Reviewed-by Uma Shankar <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_hdcp.c | 45 ++++++++++++++++------- 1 file changed, 31 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0
drivers/gpu/drm/i915/display/intel_hdcp.c int intel_hdcp_auth_downstream(struct intel_connector *connector) · line 620
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +6
-1@@ -612,7 +612,12 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)return ret; } -/* Implements Part 1 of the HDCP authorization procedure */ +/* +* Implements Part 1 of the HDCP authorization procedure. +* Authentication Part 1 steps for Multi-stream DisplayPort. +* Step 1. Auth Part 1 sequence on the driving MST Trasport Link. +* Step 2. Enable encryption for each stream that requires encryption. +1*/
IMO this function is generic for SST and MST. Why do we document only for MST at the top of the function? We can remove them.
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0static int intel_hdcp_auth (struct intel_connector *connector) {struct intel_digital_port *dig_port =intel_attached_dig_port (connector);@@ -766,10 +771,17 @@ static int intel_hdcp_auth(struct intel_connector *connector)return -ETIMEDOUT ; }
drivers/gpu/drm/i915/display/intel_hdcp.c static int intel_hdcp_auth(struct intel_connector *connector) · line 778
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +5
-4-/* -* XXX: If we have MST-connected devices, we need to enable encryption -* on those as well. -*/ +/* DP MST Auth Part 1 Step 2.a and Step 2.b */ +if (shim->stream_encryption) { + ret = shim->stream_encryption (connector, true); +if (ret) { + drm_err(&dev_priv->drm, "[CONNECTOR:%d:%s] Failed to enable HDCP 1.4 stream enc\n",
All the existing error messgae has the %s:%d, why are we changing it here? Could we retain the uniformity?
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +6
-0+ connector->base.base.id, connector->base.name); +return ret; + } +drm_dbg_kms (&dev_priv->drm,"HDCP 1.4 transcoder: %s stream encrypted\n" , +transcoder_name (hdcp->stream_transcoder)); + }if (repeater_present)return intel_hdcp_auth_downstream (connector);
drivers/gpu/drm/i915/display/intel_hdcp.c static int _intel_hdcp_disable(struct intel_connector *connector) · line 809
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +4
-0@@ -791,18 +803,23 @@ static int _intel_hdcp_disable(struct intel_connector *connector)drm_dbg_kms (&dev_priv->drm,"[%s:%d] HDCP is being disabled...\n" , connector->base.name, connector->base.base.id); +if (hdcp->shim->stream_encryption) { + ret = hdcp->shim->stream_encryption (connector, false); +if (ret) { + drm_err(&dev_priv->drm, "[CONNECTOR:%d:%s] Failed to disable HDCP 1.4 stream enc\n",
same here. remove CONNECTOR ?
drivers/gpu/drm/i915/display/intel_hdcp.c static int _intel_hdcp_disable(struct intel_connector *connector) · line 819
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +9
-3+ connector->base.base.id, connector->base.name); +return ret; + } +drm_dbg_kms (&dev_priv->drm,"HDCP 1.4 transcoder: %s stream encryption disabled\n" , +transcoder_name (hdcp->stream_transcoder)); + } +/* -* If there are other connectors on this port using HDCP, don't disable -* it. Instead, toggle the HDCP signalling off on that particular -* connector/pipe and exit. +* If there are other connectors on this port using HDCP, don't disable it. +* Repeat steps 1-2 for each stream that no longer requires encryption.
What is this steps 1-2 here!? Here you are not disabling if other streams are encrpted. May be you want to put something like "Untill all steams of MST stopped encrypting, dont disable the port encryption"
-Ram
Quoted 15 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +1
-6*/ -if (dig_port->num_hdcp_streams >0 ) { - ret = hdcp->shim->toggle_signalling (dig_port, - cpu_transcoder, false); -if (ret) -DRM_ERROR ("Failed to disable HDCP signalling\n" ); +if (dig_port->num_hdcp_streams >0 )return ret; - } hdcp->hdcp_encrypted = false;intel_de_write (dev_priv,HDCP_CONF (dev_priv, cpu_transcoder, port),0 );Signature · 1 line
2.26.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 07/17] drm/i915/hdcp: Enable HDCP 1.4 stream encryption
Quoted 36 lines · Ramalingam C
Quoted 35 lines · Anshuman Gupta
Enable HDCP 1.4 DP MST stream encryption.
Enable stream encryption once encryption is enabled on the DP transport driving the link for each stream which has requested encryption.
Disable stream encryption for each stream that no longer requires encryption before disabling HDCP encryption on the link.
v2:
- Added debug print for stream encryption.
- Disable the hdcp on port after disabling last stream encryption.
v3:
- Cosmetic change, removed the value less comment. [Uma] v4:
- Split the Gen12 HDCP enablement patch. [Ram]
- Add connector details indrm_err.Cc Ramalingam C <[email protected]>Reviewed-by Uma Shankar <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_hdcp.c | 45 ++++++++++++++++------- 1 file changed, 31 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0@@ -612,7 +612,12 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)return ret; }
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_hdcp.c int intel_hdcp_auth_downstream(struct intel_connector *connector)
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +6
-1-/* Implements Part 1 of the HDCP authorization procedure */ +/* +* Implements Part 1 of the HDCP authorization procedure. +* Authentication Part 1 steps for Multi-stream DisplayPort. +* Step 1. Auth Part 1 sequence on the driving MST Trasport Link. +* Step 2. Enable encryption for each stream that requires encryption. +1*/ IMO this function is generic for SST and MST. Why do we document only for MST at the top of the function? We can remove them.
Sure i will remove it.
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0static int intel_hdcp_auth (struct intel_connector *connector) {struct intel_digital_port *dig_port =intel_attached_dig_port (connector);@@ -766,10 +771,17 @@ static int intel_hdcp_auth(struct intel_connector *connector)return -ETIMEDOUT ; }
Quoted 11 lines
drivers/gpu/drm/i915/display/intel_hdcp.c static int intel_hdcp_auth(struct intel_connector *connector) · line 778
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +5
-4-/* -* XXX: If we have MST-connected devices, we need to enable encryption -* on those as well. -*/ +/* DP MST Auth Part 1 Step 2.a and Step 2.b */ +if (shim->stream_encryption) { + ret = shim->stream_encryption (connector, true); +if (ret) { + drm_err(&dev_priv->drm, "[CONNECTOR:%d:%s] Failed to enable HDCP 1.4 stream enc\n",All the existing error messgae has the %s:%d, why are we changing it here? Could we retain the uniformity?
Sure i will fix this in entire series.
Quoted 18 lines
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +6
-0+ connector->base.base.id, connector->base.name); +return ret; + } +drm_dbg_kms (&dev_priv->drm,"HDCP 1.4 transcoder: %s stream encrypted\n" , +transcoder_name (hdcp->stream_transcoder)); + }if (repeater_present)return intel_hdcp_auth_downstream (connector);drivers/gpu/drm/i915/display/intel_hdcp.c static int _intel_hdcp_disable(struct intel_connector *connector) · line 809
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +4
-0@@ -791,18 +803,23 @@ static int _intel_hdcp_disable(struct intel_connector *connector)drm_dbg_kms (&dev_priv->drm,"[%s:%d] HDCP is being disabled...\n" , connector->base.name, connector->base.base.id); +if (hdcp->shim->stream_encryption) { + ret = hdcp->shim->stream_encryption (connector, false); +if (ret) { + drm_err(&dev_priv->drm, "[CONNECTOR:%d:%s] Failed to disable HDCP 1.4 stream enc\n",same here. remove CONNECTOR ?
Quoted 16 lines
drivers/gpu/drm/i915/display/intel_hdcp.c static int _intel_hdcp_disable(struct intel_connector *connector) · line 819
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +9
-3+ connector->base.base.id, connector->base.name); +return ret; + } +drm_dbg_kms (&dev_priv->drm,"HDCP 1.4 transcoder: %s stream encryption disabled\n" , +transcoder_name (hdcp->stream_transcoder)); + } +/* -* If there are other connectors on this port using HDCP, don't disable -* it. Instead, toggle the HDCP signalling off on that particular -* connector/pipe and exit. +* If there are other connectors on this port using HDCP, don't disable it. +* Repeat steps 1-2 for each stream that no longer requires encryption. What is this steps 1-2 here!? Here you are not disabling if other streams are encrpted. May be you want to put something like "Untill all steams of MST stopped encrypting, dont disable the port encryption"
Sure i will fix this.
Thanks,
Anshuman.
Quoted 12 lines
-Ram
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +1
-6*/ -if (dig_port->num_hdcp_streams >0 ) { - ret = hdcp->shim->toggle_signalling (dig_port, - cpu_transcoder, false); -if (ret) -DRM_ERROR ("Failed to disable HDCP signalling\n" ); +if (dig_port->num_hdcp_streams >0 )return ret; - }
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0hdcp->hdcp_encrypted = false;intel_de_write (dev_priv,HDCP_CONF (dev_priv, cpu_transcoder, port),0 );Signature · 1 line
2.26.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 8/17 drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support
In reply to Anshuman GuptaEnable HDCP 1.4 over DP MST for Gen12.
--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_mst.c +3 -7
@@ -826,13 +826,9 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolointel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector); - -/* TODO: Figure out how to make HDCP work on GEN12+ */ -if (INTEL_GEN (dev_priv) <12 ) { - ret =intel_dp_init_hdcp (dig_port, intel_connector); -if (ret) -DRM_DEBUG_KMS ("HDCP init failed, skipping.\n" ); - } + ret =intel_dp_init_hdcp (dig_port, intel_connector); +if (ret) +drm_dbg_kms (&dev_priv->drm,"HDCP init failed, skipping.\n" );/* * Reuse the prop from the SST connector because we're
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v5 08/17] drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support
Quoted 13 lines · Anshuman Gupta
Enable HDCP 1.4 over DP MST for Gen12.
Cc Ramalingam C <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0
drivers/gpu/drm/i915/display/intel_dp_mst.c static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo · line 831
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-3@@ -826,13 +826,9 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolointel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector); - -/* TODO: Figure out how to make HDCP work on GEN12+ */ -if (INTEL_GEN (dev_priv) <12 ) {
Just a thought, shouldn't we enable for the platforms that we have tested HDCP? like <= 12.
We could keep expanding the list supported.
Ram.
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +3
-4- ret =intel_dp_init_hdcp (dig_port, intel_connector); -if (ret) -DRM_DEBUG_KMS ("HDCP init failed, skipping.\n" ); - } + ret =intel_dp_init_hdcp (dig_port, intel_connector); +if (ret) +drm_dbg_kms (&dev_priv->drm,"HDCP init failed, skipping.\n" );/* * Reuse the prop from the SST connector because we're Signature · 1 line
2.26.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 08/17] drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support
Quoted 17 lines · Ramalingam C
Quoted 16 lines · Anshuman Gupta
Enable HDCP 1.4 over DP MST for Gen12.
Cc Ramalingam C <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0@@ -826,13 +826,9 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolointel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector);
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo · line 831
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-3- -/* TODO: Figure out how to make HDCP work on GEN12+ */ -if (INTEL_GEN (dev_priv) <12 ) {Just a thought, shouldn't we enable for the platforms that we have tested HDCP? like <= 12.
We could keep expanding the list supported.
thanks for comment, i will keep this as if (INTEL_GEN(dev_priv) < 12) Thanks,
Anshuman
Quoted 10 lines
Ram.
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +3
-4- ret =intel_dp_init_hdcp (dig_port, intel_connector); -if (ret) -DRM_DEBUG_KMS ("HDCP init failed, skipping.\n" ); - } + ret =intel_dp_init_hdcp (dig_port, intel_connector); +if (ret) +drm_dbg_kms (&dev_priv->drm,"HDCP init failed, skipping.\n" );
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0/* * Reuse the prop from the SST connector because we're Signature · 1 line
2.26.2
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v5 08/17] drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support
Quoted 18 lines · Anshuman Gupta
Quoted 17 lines · Ramalingam C
Quoted 16 lines · Anshuman Gupta
Enable HDCP 1.4 over DP MST for Gen12.
Cc Ramalingam C <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0@@ -826,13 +826,9 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolointel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector);
Quoted 8 lines
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo · line 831
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-3- -/* TODO: Figure out how to make HDCP work on GEN12+ */ -if (INTEL_GEN (dev_priv) <12 ) {Just a thought, shouldn't we enable for the platforms that we have tested HDCP? like <= 12.
We could keep expanding the list supported.
thanks for comment, i will keep this as if (
INTEL_GEN(dev_priv)< 12)
I guess you meant <= 12.
Ram.
Quoted 12 lines
Thanks,
AnshumanQuoted 10 lines
Ram.
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +3
-4- ret =intel_dp_init_hdcp (dig_port, intel_connector); -if (ret) -DRM_DEBUG_KMS ("HDCP init failed, skipping.\n" ); - } + ret =intel_dp_init_hdcp (dig_port, intel_connector); +if (ret) +drm_dbg_kms (&dev_priv->drm,"HDCP init failed, skipping.\n" );
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0/* * Reuse the prop from the SST connector because we're Signature · 1 line
2.26.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 08/17] drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support
Quoted 25 lines · Ramalingam C
Quoted 24 lines · Anshuman Gupta
Quoted 23 lines · Ramalingam C
Quoted 13 lines · Anshuman Gupta
Enable HDCP 1.4 over DP MST for Gen12.
Cc Ramalingam C <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0drivers/gpu/drm/i915/display/intel_dp_mst.c static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo · line 831
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-3@@ -826,13 +826,9 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolointel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector); - -/* TODO: Figure out how to make HDCP work on GEN12+ */ -if (INTEL_GEN (dev_priv) <12 ) {Just a thought, shouldn't we enable for the platforms that we have tested HDCP? like <= 12.
Quoted 3 lines
Quoted 2 lines
Quoted 1 line
We could keep expanding the list supported.
thanks for comment, i will keep this as if (
INTEL_GEN(dev_priv)< 12)I guess you meant <= 12.
:) yes it was typo
Thanks,
Anshuman.
Quoted 14 lines
Ram.
Quoted 12 lines
Thanks,
AnshumanQuoted 10 lines
Ram.
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +3
-4- ret =intel_dp_init_hdcp (dig_port, intel_connector); -if (ret) -DRM_DEBUG_KMS ("HDCP init failed, skipping.\n" ); - } + ret =intel_dp_init_hdcp (dig_port, intel_connector); +if (ret) +drm_dbg_kms (&dev_priv->drm,"HDCP init failed, skipping.\n" );
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0/* * Reuse the prop from the SST connector because we're Signature · 1 line
2.26.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 9/17 drm/i915/hdcp: Pass dig_port to intel_hdcp_init
In reply to Anshuman GuptaPass dig_port as an argument to intel_hdcp_init() and intel_hdcp2_init().
This will be required for HDCP 2.2 stream encryption.
--- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 4 ++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +++++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 4 +++- drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_hdcp.c +2 -2
@@ -755,10 +755,10 @@ int intel_dp_init_hdcp(struct intel_digital_port *dig_port,return 0 ;if (intel_connector->mst_port) -return intel_hdcp_init (intel_connector, port, +return intel_hdcp_init (intel_connector, dig_port, &intel_dp_mst_hdcp_shim);else if (!intel_dp_is_edp (intel_dp)) -return intel_hdcp_init (intel_connector, port, +return intel_hdcp_init (intel_connector, dig_port, &intel_dp_hdcp_shim);return 0 ;
drivers/gpu/drm/i915/display/intel_hdcp.c +7 -5
@@ -1984,12 +1984,13 @@ static enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder) }static int initialize_hdcp_port_data (struct intel_connector *connector, -enum port port, +struct intel_digital_port *dig_port,const struct intel_hdcp_shim *shim) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;struct hdcp_port_data *data = &hdcp->port_data; +enum port port = dig_port->base.port;if (INTEL_GEN (dev_priv) <12 ) data->fw_ddi =intel_get_mei_fw_ddi_index (port);
@@ -2062,14 +2063,15 @@ void intel_hdcp_component_init(struct drm_i915_private *dev_priv) } } -static void intel_hdcp2_init (struct intel_connector *connector,enum port port, +static void intel_hdcp2_init (struct intel_connector *connector, +struct intel_digital_port *dig_port,const struct intel_hdcp_shim *shim) {struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;int ret; - ret =initialize_hdcp_port_data (connector, port, shim); + ret =initialize_hdcp_port_data (connector, dig_port, shim);if (ret) {drm_dbg_kms (&i915->drm,"Mei hdcp data init failed\n" );return ;
@@ -2079,7 +2081,7 @@ static void intel_hdcp2_init(struct intel_connector *connector, enum port port, }int intel_hdcp_init (struct intel_connector *connector, -enum port port, +struct intel_digital_port *dig_port,const struct intel_hdcp_shim *shim) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);
@@ -2090,7 +2092,7 @@ int intel_hdcp_init(struct intel_connector *connector,return -EINVAL ;if (is_hdcp2_supported (dev_priv) && !connector->mst_port) -intel_hdcp2_init (connector, port, shim); +intel_hdcp2_init (connector, dig_port, shim); ret = drm_connector_attach_content_protection_property(&connector->base,
drivers/gpu/drm/i915/display/intel_hdcp.h +3 -1
@@ -18,13 +18,15 @@ struct intel_connector;struct intel_crtc_state ;struct intel_encoder ;struct intel_hdcp_shim ; +struct intel_digital_port ;enum port ;enum transcoder ;void intel_hdcp_atomic_check (struct drm_connector *connector,struct drm_connector_state *old_state,struct drm_connector_state *new_state); -int intel_hdcp_init (struct intel_connector *connector,enum port port, +int intel_hdcp_init (struct intel_connector *connector, +struct intel_digital_port *dig_port,const struct intel_hdcp_shim *hdcp_shim);int intel_hdcp_enable (struct intel_connector *connector,const struct intel_crtc_state *pipe_config,u8 content_type);
drivers/gpu/drm/i915/display/intel_hdmi.c +1 -1
@@ -3302,7 +3302,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port, intel_hdmi->attached_connector = intel_connector;if (is_hdcp_supported (dev_priv, port)) { -int ret =intel_hdcp_init (intel_connector, port, +int ret =intel_hdcp_init (intel_connector, dig_port, &intel_hdmi_hdcp_shim);if (ret) drm_dbg_kms(&dev_priv->drm,
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 10/17 drm/i915/hdcp: Encapsulate hdcp_port_data to dig_port
In reply to Anshuman Guptahdcp_port_data is specific to a port on which HDCP encryption is getting enabled, so encapsulate it to intel_digital_port.
This will be required to enable HDCP 2.2 stream encryption.
v2:
- 's/port_data/hdcp_port_data'. [Ram]
--- drivers/gpu/drm/i915/display/intel_ddi.c | 2 + .../drm/i915/display/intel_display_types.h | 5 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 56 +++++++++++-------- 3 files changed, 39 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +2 -0
@@ -4746,6 +4746,8 @@ static void intel_ddi_encoder_destroy(struct drm_encoder *encoder)intel_dp_encoder_flush_work (encoder);drm_encoder_cleanup (encoder); +if (dig_port) +kfree (dig_port->hdcp_port_data.streams);kfree (dig_port); }
drivers/gpu/drm/i915/display/intel_display_types.h +3 -2
@@ -402,7 +402,6 @@ struct intel_hdcp {* content can flow only through a link protected by HDCP2.2. */ u8 content_type; -struct hdcp_port_data port_data;bool is_paired;bool is_repeater;
@@ -1446,10 +1445,12 @@ struct intel_digital_port {enum phy_fia tc_phy_fia;u8 tc_phy_fia_idx; -/* protects num_hdcp_streams reference count */ +/* protects num_hdcp_streams reference count, port_data */ struct mutex hdcp_mutex;/* the number of pipes using HDCP signalling out of this port */ unsigned int num_hdcp_streams; +/* HDCP port data need to pass to security f/w */ +struct hdcp_port_data hdcp_port_data; void (*write_infoframe)(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state,
drivers/gpu/drm/i915/display/intel_hdcp.c +34 -22
191 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 11/17 misc/mei/hdcp: Fix AUTH_STREAM_REQ cmd buffer len
In reply to Anshuman GuptaFix the size of WIRED_REPEATER_AUTH_STREAM_REQ cmd buffer size. It is based upon the actual number of MST streams and size of wired_cmd_repeater_auth_stream_req_in.
Excluding the size of hdcp_cmd_header.
v2:hdcp_cmd_header size annotation nitpick. [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/misc/mei/hdcp/mei_hdcp.c +1 -2
@@ -569,8 +569,7 @@ static int mei_hdcp_verify_mprime(struct device *dev, verify_mprime_in->header.api_version =HDCP_API_VERSION ; verify_mprime_in->header.command_id =WIRED_REPEATER_AUTH_STREAM_REQ ; verify_mprime_in->header.status =ME_HDCP_STATUS_SUCCESS ; - verify_mprime_in->header.buffer_len = -WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_MIN_IN ; + verify_mprime_in->header.buffer_len = cmd_size -sizeof (verify_mprime_in->header); verify_mprime_in->port.integrated_port_type = data->port_type; verify_mprime_in->port.physical_port = (u8 )data->fw_ddi;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 12/17 drm/hdcp: Max MST content streams
In reply to Anshuman GuptaLet's define Maximum MST content streams up to four generically which can be supported by modern display controllers.
--- include/drm/drm_hdcp.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/drm/drm_hdcp.h +4 -4
@@ -101,11 +101,11 @@/* Following Macros take a byte at a time for bit(s) masking */ /* -* TODO: This has to be changed for DP MST, as multiple stream on -* same port is possible. -* For HDCP2.2 on HDMI and DP SST this value is always 1. +* TODO: HDCP_2_2_MAX_CONTENT_STREAMS_CNT is based upon actual +* H/W MST streams capacity. +* This required to be moved out to platform specific header. */ -#define HDCP_2_2_MAX_CONTENT_STREAMS_CNT 1 +#define HDCP_2_2_MAX_CONTENT_STREAMS_CNT 4#define HDCP_2_2_TXCAP_MASK_LEN 2#define HDCP_2_2_RXCAPS_LEN 3#define HDCP_2_2_RX_REPEATER (x) ((x) & BIT(0))
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 13/17 drm/i915/hdcp: MST streams support in hdcp port_data
In reply to Anshuman GuptaAdd support for multiple mst stream in hdcp port data which will be used by RepeaterAuthStreamManage msg and HDCP 2.2 security f/w for m' validation.
Security f/w doesn't have any provision to mark the stream_type for each stream separately, it just take single input of stream_type while authentiating the port. So driver mark each stream_type with common highest supported content type for all streams in DP MST Topology.
Security f/w supports RepeaterAuthStreamManage msg and m' validation only once during port authentication and encryption.
v2:
- Init the hdcp port data k for HDMI/DP SST stream. v3:
- Cosmetic changes. [Uma]
v4:
- 's/port_auth/hdcp_port_auth'. [Ram]
- Commit log improvement.
--- .../drm/i915/display/intel_display_types.h | 4 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 103 +++++++++++++++--- 2 files changed, 92 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +3 -1
@@ -1445,10 +1445,12 @@ struct intel_digital_port {enum phy_fia tc_phy_fia;u8 tc_phy_fia_idx; -/* protects num_hdcp_streams reference count, port_data */ +/* protects num_hdcp_streams reference count, port_data and port_auth */ struct mutex hdcp_mutex;/* the number of pipes using HDCP signalling out of this port */ unsigned int num_hdcp_streams; +/* port HDCP auth status */ +bool hdcp_auth_status;/* HDCP port data need to pass to security f/w */ struct hdcp_port_data hdcp_port_data;
drivers/gpu/drm/i915/display/intel_hdcp.c +89 -14
182 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v5 13/17] drm/i915/hdcp: MST streams support in hdcp port_data
Quoted 11 lines · Anshuman Gupta
Add support for multiple mst stream in hdcp port data which will be used by RepeaterAuthStreamManage msg and HDCP 2.2 security f/w for m' validation.
Security f/w doesn't have any provision to mark the
stream_typefor each stream separately, it just take single input ofstream_typewhile authentiating the port. So driver mark eachstream_typewith common highest supported content type for all streams in DP MST Topology.
Quoted 2 lines
Security f/w supports RepeaterAuthStreamManage msg and m' validation only once during port authentication and encryption.
Could we make a note in commit msg that we need to support content type per stream when fw supports it?
Quoted 22 lines
v2:
- Init the hdcp port data k for HDMI/DP SST stream. v3:
- Cosmetic changes. [Uma]
v4:
- 's/port_auth/hdcp_port_auth'. [Ram]
- Commit log improvement.Cc Ramalingam C <[email protected]>Reviewed-by Uma Shankar <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- .../drm/i915/display/intel_display_types.h | 4 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 103 +++++++++++++++--- 2 files changed, 92 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/display/intel_display_types.h +0
-0
drivers/gpu/drm/i915/display/intel_display_types.h struct intel_digital_port { · line 1448
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display_types.h +1
-1@@ -1445,10 +1445,12 @@ struct intel_digital_port {enum phy_fia tc_phy_fia;u8 tc_phy_fia_idx; -/* protects num_hdcp_streams reference count, port_data */ +/* protects num_hdcp_streams reference count, port_data and port_auth */
Either correct the variable names or refer it as "hdcp related variables"
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display_types.h +2
-0struct mutex hdcp_mutex;/* the number of pipes using HDCP signalling out of this port */ unsigned int num_hdcp_streams; +/* port HDCP auth status */ +bool hdcp_auth_status;/* HDCP port data need to pass to security f/w */ struct hdcp_port_data hdcp_port_data;drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0
drivers/gpu/drm/i915/display/intel_hdcp.c line 34
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +6
-0@@ -26,6 +26,64 @@#define KEY_LOAD_TRIES 5#define HDCP2_LC_RETRY_CNT 3 +static int intel_conn_to_vcpi (struct intel_connector *connector) +{ +/* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */ +return connector->port ? connector->port->vcpi.vcpi :0 ; +} +
Lets add a comment about policy on content type selection and why. And mention that ideally we should be able to support different content type for different streams.
Quoted 175 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +81
-14+static int +intel_hdcp_required_content_stream (struct intel_digital_port *dig_port) +{ +struct drm_connector_list_iter conn_iter; +struct intel_digital_port *conn_dig_port; +struct intel_connector *connector; +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct hdcp_port_data *data = &dig_port->hdcp_port_data; +bool enforce_type0 = false; +int k; + +if (dig_port->hdcp_auth_status) +return 0 ; + +drm_connector_list_iter_begin (&i915->drm, &conn_iter); +for_each_intel_connector_iter (connector, &conn_iter) { +if (!intel_encoder_is_mst (intel_attached_encoder (connector))) +continue ; + + conn_dig_port =intel_attached_dig_port (connector); +if (conn_dig_port != dig_port) +continue ; + +if (connector->base.status == connector_status_disconnected) +continue ; + +if (!enforce_type0 && !intel_hdcp2_capable (connector)) + enforce_type0 = true; + + data->streams[data->k].stream_id =intel_conn_to_vcpi (connector); + data->k++; + +/* if there is only one active stream */ +if (dig_port->dp.active_mst_links <=1 ) +break ; + } +drm_connector_list_iter_end (&conn_iter); + +if (drm_WARN_ON (&i915->drm, data->k >INTEL_NUM_PIPES (i915) || data->k ==0 )) +return -EINVAL ; + +/* +* Apply common protection level across all streams in DP MST Topology. +* Use highest supported content type for all streams in DP MST Topology. +*/ +for (k =0 ; k < data->k; k++) + data->streams[k].stream_type = + enforce_type0 ?DRM_MODE_HDCP_CONTENT_TYPE0 :DRM_MODE_HDCP_CONTENT_TYPE1 ; + +return 0 ; +} +static bool intel_hdcp_is_ksv_valid (u8 *ksv) {@@ -1476,13 +1534,14 @@ staticint _hdcp2_propagate_stream_management_info (struct intel_connector *connector) {struct intel_digital_port *dig_port =intel_attached_dig_port (connector); +struct hdcp_port_data *data = &dig_port->hdcp_port_data;struct intel_hdcp *hdcp = &connector->hdcp;union {struct hdcp2_rep_stream_manage stream_manage;struct hdcp2_rep_stream_ready stream_ready; } msgs;const struct intel_hdcp_shim *shim = hdcp->shim; -int ret; +int ret, streams_size_delta, i;if (connector->hdcp.seq_num_m >HDCP_2_2_SEQ_NUM_MAX )return -ERANGE ;@@ -1491,16 +1550,18 @@ int _hdcp2_propagate_stream_management_info(struct intel_connector *connector) msgs.stream_manage.msg_id =HDCP_2_2_REP_STREAM_MANAGE ;drm_hdcp_cpu_to_be24 (msgs.stream_manage.seq_num_m, hdcp->seq_num_m); -/* K no of streams is fixed as 1. Stored as big-endian. */ - msgs.stream_manage.k =cpu_to_be16 (1 ); + msgs.stream_manage.k =cpu_to_be16 (data->k); -/* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */ - msgs.stream_manage.streams[0 ].stream_id =0 ; - msgs.stream_manage.streams[0 ].stream_type = hdcp->content_type; +for (i =0 ; i < data->k; i++) { + msgs.stream_manage.streams[i].stream_id = data->streams[i].stream_id; + msgs.stream_manage.streams[i].stream_type = data->streams[i].stream_type; + } + streams_size_delta = (HDCP_2_2_MAX_CONTENT_STREAMS_CNT - data->k) * +sizeof (struct hdcp2_streamid_type );/* Send it to Repeater */ ret = shim->write_2_2_msg (dig_port, &msgs.stream_manage, -sizeof (msgs.stream_manage)); +sizeof (msgs.stream_manage) - streams_size_delta);if (ret <0 ) goto out;@@ -1509,8 +1570,7 @@ int _hdcp2_propagate_stream_management_info(struct intel_connector *connector)if (ret <0 ) goto out; - dig_port->hdcp_port_data.seq_num_m = hdcp->seq_num_m; - dig_port->hdcp_port_data.streams[0 ].stream_type = hdcp->content_type; + data->seq_num_m = hdcp->seq_num_m; ret =hdcp2_verify_mprime (connector, &msgs.stream_ready);@@ -1671,6 +1731,7 @@ static int hdcp2_enable_encryption(struct intel_connector *connector) port),LINK_ENCRYPTION_STATUS , HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS); + dig_port->hdcp_auth_status = true;return ret; }@@ -1745,11 +1806,9 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector) {struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct drm_i915_private *i915 =to_i915 (connector->base.dev); -struct hdcp_port_data *data = &dig_port->hdcp_port_data; -struct intel_hdcp *hdcp = &connector->hdcp; -int ret, i, tries =3 ; +int ret =0 , i, tries =3 ; -for (i =0 ; i < tries; i++) { +for (i =0 ; i < tries && !dig_port->hdcp_auth_status; i++) { ret =hdcp2_authenticate_sink (connector);if (!ret) { ret =hdcp2_propagate_stream_management_info (connector);@@ -1759,7 +1818,7 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector) ret);break ; } - data->streams[0 ].stream_type = hdcp->content_type; + ret =hdcp2_authenticate_port (connector);if (!ret)break ;@@ -1794,7 +1853,9 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)static int _intel_hdcp2_enable (struct intel_connector *connector) { +struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct drm_i915_private *i915 =to_i915 (connector->base.dev); +struct hdcp_port_data *data = &dig_port->hdcp_port_data;struct intel_hdcp *hdcp = &connector->hdcp;int ret;@@ -1802,6 +1863,16 @@ static int _intel_hdcp2_enable(struct intel_connector *connector) connector->base.name, connector->base.base.id, hdcp->content_type); +/* Stream which requires encryption */ +if (!intel_encoder_is_mst (intel_attached_encoder (connector))) { + data->k =1 ; + data->streams[0 ].stream_type = hdcp->content_type; + }else { + ret =intel_hdcp_required_content_stream (dig_port); +if (ret) +return ret; + } + ret =hdcp2_authenticate_and_encrypt (connector);if (ret) { drm_dbg_kms(&i915->drm, "HDCP2 Type%d Enabling Failed. (%d)\n",@@ -1819,7 +1890,9 @@ static int _intel_hdcp2_enable(struct intel_connector *connector)static int _intel_hdcp2_disable (struct intel_connector *connector) { +struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct drm_i915_private *i915 =to_i915 (connector->base.dev); +struct hdcp_port_data *data = &dig_port->hdcp_port_data;int ret; drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is being Disabled\n",
drivers/gpu/drm/i915/display/intel_hdcp.c static int _intel_hdcp2_disable(struct intel_connector *connector) · line 1911
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +2
-0@@ -1831,6 +1904,8 @@ static int _intel_hdcp2_disable(struct intel_connector *connector)drm_dbg_kms (&i915->drm,"Port deauth failed.\n" ); connector->hdcp.hdcp2_encrypted = false; + dig_port->hdcp_auth_status = false; + data->k =0 ;return ret; }
With these comments addressed LGTM.
Ram
Quoted 3 lines
Signature · 1 line
2.26.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 14/17 drm/i915/hdcp: Pass connector to check_2_2_link
In reply to Anshuman GuptaThis requires for HDCP 2.2 MST check link.
As for DP/HDMI shims check_2_2_link retrieves the connector from dig_port, this is not sufficient or DP MST connector, there can be multiple DP MST topology connector associated with same dig_port.
--- drivers/gpu/drm/i915/display/intel_display_types.h | 3 ++- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 3 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +2 -1
@@ -375,7 +375,8 @@ struct intel_hdcp_shim { bool is_repeater, u8 type);/* HDCP2.2 Link Integrity Check */ -int (*check_2_2_link)(struct intel_digital_port *dig_port); +int (*check_2_2_link)(struct intel_digital_port *dig_port, +struct intel_connector *connector); };struct intel_hdcp {
drivers/gpu/drm/i915/display/intel_dp_hdcp.c +2 -1
@@ -585,7 +585,8 @@ int intel_dp_hdcp2_config_stream_type(struct intel_digital_port *dig_port, }static -int intel_dp_hdcp2_check_link (struct intel_digital_port *dig_port) +int intel_dp_hdcp2_check_link (struct intel_digital_port *dig_port, +struct intel_connector *connector) {u8 rx_status;int ret;
drivers/gpu/drm/i915/display/intel_hdcp.c +1 -1
@@ -1942,7 +1942,7 @@ static int intel_hdcp2_check_link(struct intel_connector *connector) goto out; } - ret = hdcp->shim->check_2_2_link (dig_port); + ret = hdcp->shim->check_2_2_link (dig_port, connector);if (ret ==HDCP_LINK_PROTECTED ) {if (hdcp->value !=DRM_MODE_CONTENT_PROTECTION_UNDESIRED ) { intel_hdcp_update_value(connector,
drivers/gpu/drm/i915/display/intel_hdmi.c +2 -1
@@ -1734,7 +1734,8 @@ int intel_hdmi_hdcp2_read_msg(struct intel_digital_port *dig_port, }static -int intel_hdmi_hdcp2_check_link (struct intel_digital_port *dig_port) +int intel_hdmi_hdcp2_check_link (struct intel_digital_port *dig_port, +struct intel_connector *connector) {u8 rx_status[HDCP_2_2_HDMI_RXSTATUS_LEN ];int ret;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v5 14/17] drm/i915/hdcp: Pass connector to check_2_2_link
Quoted 5 lines · Anshuman Gupta
This requires for HDCP 2.2 MST check link.
As for DP/HDMI shimscheck_2_2_linkretrieves the connector fromdig_port, this is not sufficient or DP MST connector, there can be multiple DP MST topology connector associated with samedig_port.
Quoted 69 lines
Cc Ramalingam C <[email protected]>Reviewed-by Uma Shankar <[email protected]>Signed-off-by Anshuman Gupta <[email protected]>--- drivers/gpu/drm/i915/display/intel_display_types.h | 3 ++- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 3 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_display_types.h +2
-1@@ -375,7 +375,8 @@ struct intel_hdcp_shim { bool is_repeater, u8 type);/* HDCP2.2 Link Integrity Check */ -int (*check_2_2_link)(struct intel_digital_port *dig_port); +int (*check_2_2_link)(struct intel_digital_port *dig_port, +struct intel_connector *connector); };struct intel_hdcp {drivers/gpu/drm/i915/display/intel_dp_hdcp.c +2
-1@@ -585,7 +585,8 @@ int intel_dp_hdcp2_config_stream_type(struct intel_digital_port *dig_port, }static -int intel_dp_hdcp2_check_link (struct intel_digital_port *dig_port) +int intel_dp_hdcp2_check_link (struct intel_digital_port *dig_port, +struct intel_connector *connector) {u8 rx_status;int ret;drivers/gpu/drm/i915/display/intel_hdcp.c +1
-1@@ -1942,7 +1942,7 @@ static int intel_hdcp2_check_link(struct intel_connector *connector) goto out; } - ret = hdcp->shim->check_2_2_link (dig_port); + ret = hdcp->shim->check_2_2_link (dig_port, connector);if (ret ==HDCP_LINK_PROTECTED ) {if (hdcp->value !=DRM_MODE_CONTENT_PROTECTION_UNDESIRED ) { intel_hdcp_update_value(connector,drivers/gpu/drm/i915/display/intel_hdmi.c +2
-1@@ -1734,7 +1734,8 @@ int intel_hdmi_hdcp2_read_msg(struct intel_digital_port *dig_port, }static -int intel_hdmi_hdcp2_check_link (struct intel_digital_port *dig_port) +int intel_hdmi_hdcp2_check_link (struct intel_digital_port *dig_port, +struct intel_connector *connector) {u8 rx_status[HDCP_2_2_HDMI_RXSTATUS_LEN ];int ret;Signature · 1 line
2.26.2
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 15/17 drm/i915/hdcp: Add HDCP 2.2 stream register
In reply to Anshuman GuptaAdd HDCP 2.2 DP MST HDCP2_STREAM_STATUS and HDCP2_AUTH_STREAM register in i915_reg header.
--- drivers/gpu/drm/i915/i915_reg.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +30 -0
@@ -9870,6 +9870,7 @@ enum skl_power_gate { _PORTD_HDCP2_BASE, \ _PORTE_HDCP2_BASE, \ _PORTF_HDCP2_BASE) + (x)) +#define PORT_HDCP2_AUTH (port) _PORT_HDCP2_BASE(port, 0x98)#define _TRANSA_HDCP2_AUTH 0x66498#define _TRANSB_HDCP2_AUTH 0x66598
@@ -9909,6 +9910,35 @@ enum skl_power_gate { TRANS_HDCP2_STATUS(trans) : \ PORT_HDCP2_STATUS(port)) +#define PORT_HDCP2_STREAM_STATUS (port) _PORT_HDCP2_BASE(port, 0xC0) +#define _TRANSA_HDCP2_STREAM_STATUS 0x664C0 +#define _TRANSB_HDCP2_STREAM_STATUS 0x665C0 +#define TRANS_HDCP2_STREAM_STATUS (trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP2_STREAM_STATUS, \ + _TRANSB_HDCP2_STREAM_STATUS) +#define STREAM_ENCRYPTION_STATUS BIT(31) +#define STREAM_TYPE_STATUS BIT(30) +#define HDCP2_STREAM_STATUS (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP2_STREAM_STATUS(trans) : \ + PORT_HDCP2_STREAM_STATUS(port)) + +#define _PORTA_HDCP2_AUTH_STREAM 0x66F00 +#define _PORTB_HDCP2_AUTH_STREAM 0x66F04 +#define PORT_HDCP2_AUTH_STREAM (port) _MMIO_PORT(port, \ + _PORTA_HDCP2_AUTH_STREAM, \ + _PORTB_HDCP2_AUTH_STREAM) +#define _TRANSA_HDCP2_AUTH_STREAM 0x66F00 +#define _TRANSB_HDCP2_AUTH_STREAM 0x66F04 +#define TRANS_HDCP2_AUTH_STREAM (trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP2_AUTH_STREAM, \ + _TRANSB_HDCP2_AUTH_STREAM) +#define AUTH_STREAM_TYPE BIT(31) +#define HDCP2_AUTH_STREAM (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP2_AUTH_STREAM(trans) : \ + PORT_HDCP2_AUTH_STREAM(port)) +/* Per-pipe DDI Function Control */ #define _TRANS_DDI_FUNC_CTL_A 0x60400#define _TRANS_DDI_FUNC_CTL_B 0x61400
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 16/17 drm/i915/hdcp: Support for HDCP 2.2 MST shim callbacks
In reply to Anshuman GuptaAdd support for HDCP 2.2 DP MST shim callback.
This adds existing DP HDCP shim callback for Link Authentication and Encryption and HDCP 2.2 stream encryption callback.
v2:
- Added a WARN_ON() instead of drm_err. [Uma]
- Cosmetic changes. [Uma]
v3:
- 's/port_data/hdcp_port_data' [Ram]
- skip redundant link check. [Ram]
--- .../drm/i915/display/intel_display_types.h | 4 + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 89 +++++++++++++++++-- 2 files changed, 85 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +4 -0
@@ -374,6 +374,10 @@ struct intel_hdcp_shim {int (*config_stream_type)(struct intel_digital_port *dig_port,bool is_repeater,u8 type); +/* Enable/Disable HDCP 2.2 stream encryption on DP MST Transport Link */ +int (*stream_2_2_encryption)(struct intel_connector *connector, +bool enable); +/* HDCP2.2 Link Integrity Check */ int (*check_2_2_link)(struct intel_digital_port *dig_port,struct intel_connector *connector);
drivers/gpu/drm/i915/display/intel_dp_hdcp.c +81 -8
112 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 17/17 drm/i915/hdcp: Enable HDCP 2.2 MST support
In reply to Anshuman GuptaEnable HDCP 2.2 over DP MST.
Authenticate and enable port encryption only once for an active HDCP 2.2 session, once port is authenticated and encrypted enable encryption for each stream that requires encryption on this port.
Similarly disable the stream encryption for each encrypted stream, once all encrypted stream encryption is disabled, disable the port HDCP encryption and deauthenticate the port.
v2:
- Add connector details in drm_err. [Ram]
- 's/port_auth/hdcp_auth_status'. [Ram]
- Added a debug print for stream enc.
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 53 ++++++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +51 -2
@@ -1695,6 +1695,36 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector)return ret; } +static int hdcp2_enable_stream_encryption (struct intel_connector *connector) +{ +struct intel_digital_port *dig_port =intel_attached_dig_port (connector); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; +enum transcoder cpu_transcoder = hdcp->cpu_transcoder; +enum port port = dig_port->base.port; +int ret =0 ; + +if (!(intel_de_read (dev_priv,HDCP2_STATUS (dev_priv, cpu_transcoder, port)) & +LINK_ENCRYPTION_STATUS )) { +drm_err (&dev_priv->drm,"[CONNECTOR:%d:%s] HDCP 2.2 Link is not encrypted\n" , + connector->base.base.id, connector->base.name); +return -EPERM ; + } + +if (hdcp->shim->stream_2_2_encryption) { + ret = hdcp->shim->stream_2_2_encryption (connector, true); +if (ret) { +drm_err (&dev_priv->drm,"[CONNECTOR:%d:%s] Failed to enable HDCP 2.2 stream enc\n" , + connector->base.base.id, connector->base.name); +return ret; + } +drm_dbg_kms (&dev_priv->drm,"HDCP 2.2 transcoder: %s stream encrypted\n" , +transcoder_name (hdcp->stream_transcoder)); + } + +return ret; +} +static int hdcp2_enable_encryption (struct intel_connector *connector) {struct intel_digital_port *dig_port =intel_attached_dig_port (connector);
@@ -1833,7 +1863,7 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)drm_dbg_kms (&i915->drm,"Port deauth failed.\n" ); } -if (!ret) { +if (!ret && !dig_port->hdcp_auth_status) {/* * Ensuring the required 200mSec min time interval between * Session Key Exchange and encryption.
@@ -1848,6 +1878,8 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector) } } + ret =hdcp2_enable_stream_encryption (connector); +return ret; }
@@ -1893,11 +1925,26 @@ static int _intel_hdcp2_disable(struct intel_connector *connector)struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct hdcp_port_data *data = &dig_port->hdcp_port_data; +struct intel_hdcp *hdcp = &connector->hdcp;int ret;drm_dbg_kms (&i915->drm,"[%s:%d] HDCP2.2 is being Disabled\n" , connector->base.name, connector->base.base.id); +if (hdcp->shim->stream_2_2_encryption) { + ret = hdcp->shim->stream_2_2_encryption (connector, false); +if (ret) { +drm_err (&i915->drm,"[CONNECTOR:%d:%s] Failed to disable HDCP 2.2 stream enc\n" , + connector->base.base.id, connector->base.name); +return ret; + } +drm_dbg_kms (&i915->drm,"HDCP 2.2 transcoder: %s stream encryption disabled\n" , +transcoder_name (hdcp->stream_transcoder)); + } + +if (dig_port->num_hdcp_streams >0 ) +return ret; + ret =hdcp2_disable_encryption (connector);if (hdcp2_deauthenticate_port (connector) <0 )
@@ -1921,6 +1968,7 @@ static int intel_hdcp2_check_link(struct intel_connector *connector)int ret =0 ;mutex_lock (&hdcp->mutex); +mutex_lock (&dig_port->hdcp_mutex); cpu_transcoder = hdcp->cpu_transcoder;/* hdcp2_check_link is expected only when HDCP2.2 is Enabled */
@@ -1998,6 +2046,7 @@ static int intel_hdcp2_check_link(struct intel_connector *connector) } out: +mutex_unlock (&dig_port->hdcp_mutex);mutex_unlock (&hdcp->mutex);return ret; }
@@ -2179,7 +2228,7 @@ int intel_hdcp_init(struct intel_connector *connector,if (!shim)return -EINVAL ; -if (is_hdcp2_supported (dev_priv) && !connector->mst_port) +if (is_hdcp2_supported (dev_priv))intel_hdcp2_init (connector, dig_port, shim); ret =
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for HDCP 2.2 and HDCP 1.4 Gen12 DP MST support (rev4)
In reply to Anshuman Gupta== Series Details ==
== Series Details ==
Series: HDCP 2.2 and HDCP 1.4 Gen12 DP MST support (rev4)
URL : https://patchwork.freedesktop.org/series/82998/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. - +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:257:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:261:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +drivers/gpu/drm/i915/gt/intel_reset.c:1312:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block +drivers/gpu/drm/i915/gt/selftest_reset.c:100:20: expected void *in +drivers/gpu/drm/i915/gt/selftest_reset.c:100:20: got void [noderef] __iomem *[assigned] s +drivers/gpu/drm/i915/gt/selftest_reset.c:100:20: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gt/selftest_reset.c:101:46: expected void const *src +drivers/gpu/drm/i915/gt/selftest_reset.c:101:46: got void [noderef] __iomem *[assigned] s +drivers/gpu/drm/i915/gt/selftest_reset.c:101:46: warning: incorrect type in argument 2 (different address spaces) +drivers/gpu/drm/i915/gt/selftest_reset.c:136:20: expected void *in +drivers/gpu/drm/i915/gt/selftest_reset.c:136:20: got void [noderef] __iomem *[assigned] s +drivers/gpu/drm/i915/gt/selftest_reset.c:136:20: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gt/selftest_reset.c:137:46: expected void const *src +drivers/gpu/drm/i915/gt/selftest_reset.c:137:46: got void [noderef] __iomem *[assigned] s +drivers/gpu/drm/i915/gt/selftest_reset.c:137:46: warning: incorrect type in argument 2 (different address spaces) +drivers/gpu/drm/i915/gt/selftest_reset.c:98:34: expected unsigned int [usertype] *s +drivers/gpu/drm/i915/gt/selftest_reset.c:98:34: got void [noderef] __iomem *[assigned] s +drivers/gpu/drm/i915/gt/selftest_reset.c:98:34: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/i915/gvt/mmio.c:290:23: warning: memcpy with byte count of 279040 +drivers/gpu/drm/i915/i915_perf.c:1440:15: warning: memset with byte count of 16777216 +drivers/gpu/drm/i915/i915_perf.c:1494:15: warning: memset with byte count of 16777216 +./include/linux/seqlock.h:838:24: warning: trying to copy expression type 31 +./include/linux/seqlock.h:838:24: warning: trying to copy expression type 31 +./include/linux/seqlock.h:864:16: warning: trying to copy expression type 31 +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write8' - different lock contexts for basic block
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for HDCP 2.2 and HDCP 1.4 Gen12 DP MST support (rev4)
In reply to Anshuman Gupta== Series Details ==
== Series Details ==
Series: HDCP 2.2 and HDCP 1.4 Gen12 DP MST support (rev4)
URL : https://patchwork.freedesktop.org/series/82998/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9307 -> Patchwork_18883
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18883:
### IGT changes ###
#### Possible regressions ####
* {igt@kms_content_protection@dp-mst-lic-type-0} (NEW):
- fi-tgl-u2: NOTRUN -> [SKIP][1] +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-tgl-u2/igt@[email protected]
- {fi-ehl-1}: NOTRUN -> [SKIP][2] +3 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-ehl-1/igt@[email protected]
- fi-tgl-y: NOTRUN -> [SKIP][3] +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-tgl-y/igt@[email protected]
* {igt@kms_content_protection@dp-mst-lic-type-1} (NEW):
- fi-cml-u2: NOTRUN -> [SKIP][4] +3 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-cml-u2/igt@[email protected]
- fi-icl-y: NOTRUN -> [SKIP][5] +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-icl-y/igt@[email protected]
- fi-cml-s: NOTRUN -> [SKIP][6] +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-cml-s/igt@[email protected]
* {igt@kms_content_protection@dp-mst-type-0} (NEW):
- {fi-tgl-dsi}: NOTRUN -> [SKIP][7] +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-tgl-dsi/igt@[email protected]
* {igt@kms_content_protection@dp-mst-type-1} (NEW):
- fi-icl-u2: NOTRUN -> [SKIP][8] +3 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-icl-u2/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@runner@aborted:
- {fi-dg1-1}: [FAIL][9] ([i915#2292] / [i915#2439] / [k.org#204565]) -> [FAIL][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-dg1-1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-dg1-1/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_9307 and Patchwork_18883:
### New CI tests (1) ###
* boot:
- Statuses : 41 pass(s)
- Exec time: [0.0] s
### New IGT tests (4) ###
* igt@kms_content_protection@dp-mst-lic-type-0:
- Statuses : 39 skip(s)
- Exec time: [0.0, 0.00] s
* igt@kms_content_protection@dp-mst-lic-type-1:
- Statuses : 39 skip(s)
- Exec time: [0.0, 0.00] s
* igt@kms_content_protection@dp-mst-type-0:
- Statuses : 39 skip(s)
- Exec time: [0.0, 0.00] s
* igt@kms_content_protection@dp-mst-type-1:
- Statuses : 39 skip(s)
- Exec time: [0.0, 0.00] s
Known issues
------------
Here are the changes found in Patchwork_18883 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_tiled_pread_basic:
- fi-tgl-y: [PASS][11] -> [DMESG-WARN][12] ([i915#402]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-tgl-y/igt@gem_tiled_pread_basic.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-tgl-y/igt@gem_tiled_pread_basic.html
* igt@i915_module_load@reload:
- fi-tgl-u2: [PASS][13] -> [DMESG-WARN][14] ([i915#1982] / [k.org#205379])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-tgl-u2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-tgl-u2/igt@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-byt-j1900: [PASS][15] -> [DMESG-WARN][16] ([i915#1982])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-byt-j1900/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-byt-j1900/igt@[email protected]
* igt@kms_busy@basic@flip:
- fi-kbl-soraka: [PASS][17] -> [DMESG-WARN][18] ([i915#1982])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-kbl-soraka/igt@kms_busy@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-kbl-soraka/igt@kms_busy@[email protected]
* igt@kms_cursor_legacy@basic-flip-before-cursor-atomic:
- fi-icl-u2: [PASS][19] -> [DMESG-WARN][20] ([i915#1982])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-icl-u2/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@core_hotunplug@unbind-rebind:
- fi-skl-lmem: [DMESG-WARN][21] ([i915#2605]) -> [PASS][22] +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-skl-lmem/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-skl-lmem/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- {fi-ehl-1}: [INCOMPLETE][23] -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-ehl-1/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-ehl-1/igt@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- fi-bsw-kefka: [DMESG-FAIL][25] ([i915#541]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-bsw-kefka/igt@i915_selftest@live@gt_heartbeat.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-bsw-kefka/igt@i915_selftest@live@gt_heartbeat.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- fi-icl-u2: [DMESG-WARN][27] ([i915#1982]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-icl-u2/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-icl-u2/igt@[email protected]
* igt@kms_flip@basic-plain-flip@d-dsi1:
- {fi-tgl-dsi}: [DMESG-WARN][29] ([i915#1982]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-tgl-dsi/igt@kms_flip@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-tgl-dsi/igt@kms_flip@[email protected]
* igt@vgem_basic@setversion:
- fi-tgl-y: [DMESG-WARN][31] ([i915#402]) -> [PASS][32] +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-tgl-y/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-tgl-y: [DMESG-WARN][33] ([i915#2411]) -> [DMESG-WARN][34] ([i915#1982] / [i915#2411])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-tgl-y/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-tgl-y/igt@[email protected]
* igt@i915_pm_rpm@basic-rte:
- fi-kbl-guc: [FAIL][35] ([i915#579]) -> [SKIP][36] ([fdo#109271])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/fi-kbl-guc/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/fi-kbl-guc/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2292]: https://gitlab.freedesktop.org/drm/intel/issues/2292
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2439]: https://gitlab.freedesktop.org/drm/intel/issues/2439
[i915#2605]: https://gitlab.freedesktop.org/drm/intel/issues/2605
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541
[i915#579]: https://gitlab.freedesktop.org/drm/intel/issues/579
[k.org#204565]: https://bugzilla.kernel.org/show_bug.cgi?id=204565
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379
Participating hosts (46 -> 41)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-pnv-d510 fi-bdw-samus
Build changes
-------------
* IGT: IGT_5847 -> IGTPW_5121
* Linux: CI_DRM_9307 -> Patchwork_18883
CI-20190529: 20190529
CI_DRM_9307: c094517edcd2b6bfaeebb2d92659ff6923b866f6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5121: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5121/index.html
IGT_5847: 8cffaebec5228a5042cc6928ac582a0589e2de3e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18883: d097558f9b1624d5f032fdd349a144ecac87cba9 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d097558f9b16 drm/i915/hdcp: Enable HDCP 2.2 MST support 0c318f75a087 drm/i915/hdcp: Support for HDCP 2.2 MST shim callbacks 5cb090603015 drm/i915/hdcp: Add HDCP 2.2 stream register cdf8f3e61035 drm/i915/hdcp: Pass connector to check_2_2_link ebae40e76e31 drm/i915/hdcp: MST streams support in hdcp port_data c2cb4557e699 drm/hdcp: Max MST content streams 025018f50d5c misc/mei/hdcp: Fix AUTH_STREAM_REQ cmd buffer len 12b39442e901 drm/i915/hdcp: Encapsulate hdcp_port_data to dig_port abc9290a2c05 drm/i915/hdcp: Pass dig_port to intel_hdcp_init 72efb4faa475 drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support 4e08c45d2029 drm/i915/hdcp: Enable HDCP 1.4 stream encryption 632b7a00b38f drm/i915/hdcp: HDCP stream encryption support 44feb4f85505 drm/i915/hdcp: Move HDCP enc status timeout to header 6677ed1f18cf drm/i915/hdcp: DP MST transcoder for link and stream 7c516904dceb drm/i915/hotplug: Handle CP_IRQ for DP-MST b8ca7ae7c58e drm/i915/hdcp: Get conn while content_type changed 2b772ac9feac drm/i915/hdcp: Update CP property in update_pipe
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for HDCP 2.2 and HDCP 1.4 Gen12 DP MST support (rev4)
In reply to Anshuman Gupta== Series Details ==
== Series Details ==
Series: HDCP 2.2 and HDCP 1.4 Gen12 DP MST support (rev4)
URL : https://patchwork.freedesktop.org/series/82998/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9307_full -> Patchwork_18883_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18883_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18883_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18883_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_create@forked:
- shard-iclb: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-iclb3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-iclb4/igt@[email protected]
* igt@gem_wait@write-wait@vcs0:
- shard-snb: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-snb5/igt@gem_wait@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-snb6/igt@gem_wait@[email protected]
* {igt@kms_content_protection@dp-mst-lic-type-1} (NEW):
- shard-iclb: NOTRUN -> [SKIP][5] +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-iclb6/igt@[email protected]
* {igt@kms_content_protection@dp-mst-type-0} (NEW):
- shard-tglb: NOTRUN -> [SKIP][6] +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb2/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- shard-tglb: ([FAIL][7], [FAIL][8]) ([i915#1602] / [i915#2439]) -> [FAIL][9]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb6/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb8/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_9307_full and Patchwork_18883_full:
### New CI tests (1) ###
* boot:
- Statuses : 200 pass(s)
- Exec time: [0.0] s
### New IGT tests (4) ###
* igt@kms_content_protection@dp-mst-lic-type-0:
- Statuses : 8 skip(s)
- Exec time: [0.0, 0.00] s
* igt@kms_content_protection@dp-mst-lic-type-1:
- Statuses : 8 skip(s)
- Exec time: [0.0, 0.00] s
* igt@kms_content_protection@dp-mst-type-0:
- Statuses : 8 skip(s)
- Exec time: [0.0, 0.00] s
* igt@kms_content_protection@dp-mst-type-1:
- Statuses : 8 skip(s)
- Exec time: [0.0, 0.00] s
Known issues
------------
Here are the changes found in Patchwork_18883_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@device_reset@unbind-reset-rebind:
- shard-glk: [PASS][10] -> [INCOMPLETE][11] ([i915#2283])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-glk2/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-glk5/igt@[email protected]
- shard-apl: [PASS][12] -> [INCOMPLETE][13] ([i915#1635] / [i915#2283])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-apl3/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-apl4/igt@[email protected]
- shard-kbl: [PASS][14] -> [INCOMPLETE][15] ([i915#2283])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-kbl1/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-kbl3/igt@[email protected]
- shard-tglb: [PASS][16] -> [INCOMPLETE][17] ([i915#1602] / [i915#750])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb6/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb8/igt@[email protected]
- shard-iclb: [PASS][18] -> [INCOMPLETE][19] ([i915#2283])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-iclb5/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-iclb3/igt@[email protected]
* igt@gem_eio@kms:
- shard-snb: [PASS][20] -> [DMESG-WARN][21] ([i915#1982])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-snb6/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-snb2/igt@[email protected]
* igt@gem_exec_whisper@basic-fds-priority-all:
- shard-glk: [PASS][22] -> [DMESG-WARN][23] ([i915#118] / [i915#95])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-glk1/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-glk9/igt@[email protected]
* igt@gem_wait@write-wait@bcs0:
- shard-snb: [PASS][24] -> [FAIL][25] ([i915#2256])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-snb5/igt@gem_wait@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-snb6/igt@gem_wait@[email protected]
* igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait:
- shard-kbl: [PASS][26] -> [SKIP][27] ([fdo#109271])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-kbl1/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-kbl6/igt@[email protected]
- shard-glk: [PASS][28] -> [SKIP][29] ([fdo#109271])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-glk1/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-glk3/igt@[email protected]
- shard-apl: [PASS][30] -> [SKIP][31] ([fdo#109271] / [i915#1635])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-apl7/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-apl7/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen:
- shard-skl: [PASS][32] -> [FAIL][33] ([i915#54]) +5 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl9/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl9/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-a-128x128-top-edge:
- shard-glk: [PASS][34] -> [DMESG-WARN][35] ([i915#1982]) +4 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-glk1/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-glk1/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-c-128x128-left-edge:
- shard-apl: [PASS][36] -> [DMESG-WARN][37] ([i915#1635] / [i915#1982]) +2 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-apl4/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-apl6/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-crc-atomic:
- shard-tglb: [PASS][38] -> [FAIL][39] ([i915#2346])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb5/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb2/igt@[email protected]
* igt@kms_flip@flip-vs-blocking-wf-vblank@a-edp1:
- shard-skl: [PASS][40] -> [DMESG-WARN][41] ([i915#1982]) +34 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl7/igt@kms_flip@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl10/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-vga1:
- shard-hsw: [PASS][42] -> [DMESG-WARN][43] ([i915#1982]) +3 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-hsw8/igt@kms_flip@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-hsw6/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-tglb: [PASS][44] -> [FAIL][45] ([i915#2598])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb6/igt@kms_flip@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb8/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-render:
- shard-glk: [PASS][46] -> [FAIL][47] ([i915#49])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-glk7/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-render.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-glk4/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-render.html
* igt@kms_frontbuffer_tracking@psr-rgb565-draw-pwrite:
- shard-skl: [PASS][48] -> [FAIL][49] ([i915#49]) +1 similar issue
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl6/igt@[email protected]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl8/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b:
- shard-skl: [PASS][50] -> [SKIP][51] ([fdo#109271]) +15 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl8/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl4/igt@[email protected]
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: [PASS][52] -> [FAIL][53] ([i915#1635] / [i915#247])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-apl3/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-apl8/igt@[email protected]
- shard-skl: [PASS][54] -> [FAIL][55] ([i915#247])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl8/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl2/igt@[email protected]
- shard-kbl: [PASS][56] -> [FAIL][57] ([i915#247])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-kbl4/igt@[email protected]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-kbl3/igt@[email protected]
* igt@kms_psr@cursor_mmap_gtt:
- shard-skl: [PASS][58] -> [CRASH][59] ([i915#2212])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl2/igt@kms_psr@cursor_mmap_gtt.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl4/igt@kms_psr@cursor_mmap_gtt.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][60] -> [SKIP][61] ([fdo#109441]) +2 similar issues
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-iclb8/igt@kms_psr@psr2_cursor_render.html
* igt@kms_setmode@basic:
- shard-tglb: [PASS][62] -> [FAIL][63] ([i915#31])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb5/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb6/igt@[email protected]
- shard-skl: [PASS][64] -> [FAIL][65] ([i915#31])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl10/igt@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl2/igt@[email protected]
- shard-glk: [PASS][66] -> [FAIL][67] ([i915#31])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-glk5/igt@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-glk6/igt@[email protected]
- shard-kbl: [PASS][68] -> [FAIL][69] ([i915#31])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-kbl2/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-kbl3/igt@[email protected]
- shard-iclb: [PASS][70] -> [FAIL][71] ([i915#31])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-iclb8/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-iclb6/igt@[email protected]
* igt@kms_universal_plane@universal-plane-gen9-features-pipe-a:
- shard-kbl: [PASS][72] -> [DMESG-WARN][73] ([i915#1982]) +3 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-kbl4/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-kbl7/igt@[email protected]
* igt@perf@non-sampling-read-error:
- shard-tglb: [PASS][74] -> [SKIP][75] ([i915#1354])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb5/igt@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb6/igt@[email protected]
- shard-skl: [PASS][76] -> [SKIP][77] ([fdo#109271] / [i915#1354])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl10/igt@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl2/igt@[email protected]
- shard-apl: [PASS][78] -> [SKIP][79] ([fdo#109271] / [i915#1354] / [i915#1635])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-apl6/igt@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-apl8/igt@[email protected]
- shard-glk: [PASS][80] -> [SKIP][81] ([fdo#109271] / [i915#1354])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-glk5/igt@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-glk6/igt@[email protected]
- shard-hsw: [PASS][82] -> [SKIP][83] ([fdo#109271]) +1 similar issue
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-hsw4/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-hsw1/igt@[email protected]
- shard-kbl: [PASS][84] -> [SKIP][85] ([fdo#109271] / [i915#1354])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-kbl2/igt@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-kbl3/igt@[email protected]
- shard-iclb: [PASS][86] -> [SKIP][87] ([i915#1354])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-iclb8/igt@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-iclb6/igt@[email protected]
* igt@perf@polling-parameterized:
- shard-skl: [PASS][88] -> [FAIL][89] ([i915#1542])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl5/igt@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl3/igt@[email protected]
* igt@perf_pmu@module-unload:
- shard-tglb: [PASS][90] -> [DMESG-WARN][91] ([i915#1982]) +1 similar issue
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb5/igt@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb3/igt@[email protected]
#### Possible fixes ####
* igt@gem_eio@in-flight-suspend:
- shard-hsw: [DMESG-WARN][92] ([i915#2637]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-hsw8/igt@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-hsw4/igt@[email protected]
- shard-apl: [DMESG-WARN][94] ([i915#1635] / [i915#2635]) -> [PASS][95]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-apl3/igt@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-apl6/igt@[email protected]
* igt@gem_exec_create@basic:
- shard-snb: [FAIL][96] ([i915#1037]) -> [PASS][97]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-snb2/igt@[email protected]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-snb6/igt@[email protected]
* igt@gem_exec_create@forked:
- shard-glk: [FAIL][98] -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-glk7/igt@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-glk5/igt@[email protected]
* igt@gem_exec_whisper@basic-contexts-forked-all:
- shard-iclb: [DMESG-WARN][100] ([i915#1982]) -> [PASS][101] +2 similar issues
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-iclb2/igt@[email protected]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-iclb2/igt@[email protected]
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][102] ([i915#2190]) -> [PASS][103]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb6/igt@[email protected]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb1/igt@[email protected]
* igt@gem_userptr_blits@unsync-unmap-cycles:
- shard-hsw: [FAIL][104] ([i915#1888]) -> [PASS][105] +2 similar issues
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-hsw1/igt@[email protected]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-hsw4/igt@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [DMESG-WARN][106] ([i915#1436] / [i915#716]) -> [PASS][107]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl4/igt@[email protected]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl7/igt@[email protected]
* igt@i915_suspend@sysfs-reader:
- shard-skl: [INCOMPLETE][108] ([i915#198]) -> [PASS][109]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl1/igt@[email protected]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl1/igt@[email protected]
* {igt@kms_async_flips@alternate-sync-async-flip}:
- shard-kbl: [FAIL][110] ([i915#2521]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-kbl2/igt@[email protected]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-kbl6/igt@[email protected]
* igt@kms_big_fb@linear-32bpp-rotate-180:
- shard-skl: [DMESG-WARN][112] ([i915#1982]) -> [PASS][113] +36 similar issues
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl10/igt@[email protected]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl5/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-256x85-sliding:
- shard-skl: [FAIL][114] ([i915#54]) -> [PASS][115] +2 similar issues
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl1/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl3/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-a-256x256-left-edge:
- shard-hsw: [DMESG-WARN][116] ([i915#1982]) -> [PASS][117] +1 similar issue
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-hsw6/igt@[email protected]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-hsw4/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-b-64x64-right-edge:
- shard-glk: [DMESG-WARN][118] ([i915#1982]) -> [PASS][119] +4 similar issues
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-glk7/igt@[email protected]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-glk9/igt@[email protected]
* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-hsw: [FAIL][120] ([i915#2370]) -> [PASS][121]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-hsw1/igt@[email protected]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-hsw6/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [FAIL][122] ([i915#2346]) -> [PASS][123]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl2/igt@[email protected]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl1/igt@[email protected]
* igt@kms_cursor_legacy@short-flip-before-cursor-toggle:
- shard-apl: [DMESG-WARN][124] ([i915#1635] / [i915#1982]) -> [PASS][125] +6 similar issues
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-apl8/igt@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-apl8/igt@[email protected]
* igt@kms_flip@blocking-absolute-wf_vblank-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][126] ([i915#1982]) -> [PASS][127] +2 similar issues
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-kbl1/igt@kms_flip@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-kbl2/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank@c-edp1:
- shard-skl: [FAIL][128] ([i915#79]) -> [PASS][129]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl7/igt@kms_flip@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl10/igt@kms_flip@[email protected]
* igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1:
- shard-skl: [FAIL][130] ([i915#2122]) -> [PASS][131] +2 similar issues
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl8/igt@kms_flip@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl6/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-cpu:
- shard-snb: [FAIL][132] ([i915#2546]) -> [PASS][133]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-snb2/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-snb7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-tglb: [DMESG-WARN][134] ([i915#1982]) -> [PASS][135] +2 similar issues
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb5/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb1/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-skl: [SKIP][136] ([fdo#109271]) -> [PASS][137] +4 similar issues
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt.html
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl10/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [FAIL][138] ([i915#1188]) -> [PASS][139] +1 similar issue
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl2/igt@[email protected]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl9/igt@[email protected]
* igt@kms_plane@plane-position-hole-pipe-a-planes:
- shard-apl: [FAIL][140] ([i915#1635] / [i915#2472]) -> [PASS][141]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-apl1/igt@[email protected]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-apl6/igt@[email protected]
- shard-kbl: [FAIL][142] ([i915#2472]) -> [PASS][143]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-kbl6/igt@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-kbl4/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-skl: [DMESG-WARN][144] ([i915#1982] / [i915#2621]) -> [PASS][145]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl4/igt@[email protected]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl9/igt@[email protected]
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][146] ([fdo#109441]) -> [PASS][147]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-iclb8/igt@kms_psr@psr2_primary_page_flip.html
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-iclb: [INCOMPLETE][148] ([i915#1185]) -> [PASS][149] +1 similar issue
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-iclb1/igt@[email protected]
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-iclb4/igt@[email protected]
- shard-kbl: [INCOMPLETE][150] ([i915#155]) -> [PASS][151] +1 similar issue
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-kbl3/igt@[email protected]
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-kbl6/igt@[email protected]
- shard-hsw: [INCOMPLETE][152] ([i915#2637]) -> [PASS][153]
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-hsw6/igt@[email protected]
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-hsw4/igt@[email protected]
- shard-glk: [INCOMPLETE][154] ([i915#2635]) -> [PASS][155] +1 similar issue
[154]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-glk3/igt@[email protected]
[155]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-glk9/igt@[email protected]
- shard-apl: [INCOMPLETE][156] ([i915#1635] / [i915#2635]) -> [PASS][157]
[156]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-apl6/igt@[email protected]
[157]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-apl6/igt@[email protected]
* igt@perf@gen12-unprivileged-single-ctx-counters:
- shard-tglb: [SKIP][158] ([i915#1354]) -> [PASS][159] +2 similar issues
[158]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-tglb2/igt@[email protected]
[159]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-tglb6/igt@[email protected]
* igt@perf@invalid-oa-exponent:
- shard-skl: [SKIP][160] ([fdo#109271] / [i915#1354]) -> [PASS][161] +1 similar issue
[160]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9307/shard-skl9/igt@[email protected]
[161]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/shard-skl1/igt@perf@invalid-oa-e
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18883/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines · Anshuman Gupta
This is v5 version to test with IGT https://patchwork.freedesktop.org/series/82987/
This has addressed the review comments from Ram.
It has been also tested manually with above IGT series.
As we currently do not have a setup for HDCP over DP MST on CI,
I've tested this series on local set up with the above IGT series.
Quoted 28 lines
[PATCH v5 11/17] misc/mei/hdcp: Fix
AUTH_STREAM_REQcmd buffer len has an Ack from Tomas to merge it via drm-intel.[PATCH v5 12/17] drm/hdcp: Max MST content streams has an Ack from drm-misc maintainer to merge it via drm-intel.
Test-with: [email protected]
Anshuman Gupta (17):
drm/i915/hdcp: Update CP property inupdate_pipedrm/i915/hdcp: Get conn whilecontent_typechanged drm/i915/hotplug: HandleCP_IRQfor DP-MST drm/i915/hdcp: DP MST transcoder for link and stream drm/i915/hdcp: Move HDCP enc status timeout to header drm/i915/hdcp: HDCP stream encryption support drm/i915/hdcp: Enable HDCP 1.4 stream encryption drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support drm/i915/hdcp: Passdig_porttointel_hdcp_initdrm/i915/hdcp: Encapsulatehdcp_port_datatodig_portmisc/mei/hdcp: FixAUTH_STREAM_REQcmd buffer len drm/hdcp: Max MST content streams drm/i915/hdcp: MST streams support in hdcpport_datadrm/i915/hdcp: Pass connector tocheck_2_2_linkdrm/i915/hdcp: Add HDCP 2.2 stream register drm/i915/hdcp: Support for HDCP 2.2 MST shim callbacks drm/i915/hdcp: Enable HDCP 2.2 MST support
Quoted 14 lines
drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_ddi.h | 6 +- .../drm/i915/display/intel_display_types.h | 20 +- drivers/gpu/drm/i915/display/intel_dp.c | 14 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 182 +++++++++-- drivers/gpu/drm/i915/display/intel_dp_mst.c | 12 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 294 ++++++++++++++---- drivers/gpu/drm/i915/display/intel_hdcp.h | 8 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 19 +- drivers/gpu/drm/i915/i915_reg.h | 31 ++ drivers/misc/mei/hdcp/mei_hdcp.c | 3 +- include/drm/drm_hdcp.h | 8 +- 12 files changed, 489 insertions(+), 122 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel