HDCP 2.2 DP MST Support
Subsystems (6)
cover HDCP 2.2 DP MST Support
This is RFC proposal to support HDCP 2.2 on DP MST. This series is built on below series using the common functionality of HDCP stream encryption.
Anshuman Gupta (6):
drm/i915/hdcp: Encapsulate hdcp_port_data to dig_port 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
.../drm/i915/display/intel_display_types.h | 9 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 84 +++++++++++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 114 +++++++++++++----- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- drivers/gpu/drm/i915/i915_reg.h | 30 +++++ drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- include/drm/drm_hdcp.h | 8 +- 7 files changed, 204 insertions(+), 46 deletions(-)
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 1/6 drm/i915/hdcp: Encapsulate hdcp_port_data to dig_port
hdcp_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.
--- .../drm/i915/display/intel_display_types.h | 2 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 58 ++++++++++++------- 2 files changed, 38 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +1 -1
@@ -380,7 +380,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;
@@ -1427,6 +1426,7 @@ struct intel_digital_port {struct mutex hdcp_mutex;/* the number of pipes using HDCP signalling out of this port */ unsigned int num_hdcp_streams; +struct hdcp_port_data port_data; void (*write_infoframe)(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state,
drivers/gpu/drm/i915/display/intel_hdcp.c +37 -21
211 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 2/6 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 csme/gsc f/w for m' validation.
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 43 +++++++++++++++++------ drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- include/drm/drm_hdcp.h | 8 ++--- 3 files changed, 38 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +33 -10
@@ -26,6 +26,12 @@#define KEY_LOAD_TRIES 5#define HDCP2_LC_RETRY_CNT 3 +static u8 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 ; +} +static bool intel_hdcp_is_ksv_valid (u8 *ksv) {
@@ -1469,6 +1475,7 @@ 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->port_data;struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;union {
@@ -1476,22 +1483,28 @@ int hdcp2_propagate_stream_management_info(struct intel_connector *connector)struct hdcp2_rep_stream_ready stream_ready; } msgs;const struct intel_hdcp_shim *shim = hdcp->shim; -int ret; +int ret, streams_size_delta, i; + + data->streams[data->k -1 ].stream_type = hdcp->content_type; + data->streams[data->k -1 ].stream_id =intel_conn_to_vcpi (connector);/* Prepare RepeaterAuth_Stream_Manage msg */ 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 * +sizeof (struct hdcp2_streamid_type ) - 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 )return ret;
@@ -1500,8 +1513,7 @@ int hdcp2_propagate_stream_management_info(struct intel_connector *connector)if (ret <0 )return ret; - dig_port->port_data.seq_num_m = hdcp->seq_num_m; - dig_port->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);if (ret <0 )
@@ -1641,7 +1653,7 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector) } } - data->streams[0 ].stream_type = hdcp->content_type; + data->streams[data->k -1 ].stream_type = hdcp->content_type; ret =hdcp2_authenticate_port (connector);if (ret <0 )return ret;
@@ -1765,6 +1777,7 @@ 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->port_data;struct intel_hdcp *hdcp = &connector->hdcp;int ret;
@@ -1772,6 +1785,11 @@ static int _intel_hdcp2_enable(struct intel_connector *connector) connector->base.name, connector->base.base.id, hdcp->content_type); +/* Stream which requires encryption */ + data->k++; +if (drm_WARN_ON (&i915->drm, data->k >INTEL_NUM_PIPES (i915))) +return -EINVAL ; + ret =hdcp2_authenticate_and_encrypt (connector);if (ret) { drm_dbg_kms(&i915->drm, "HDCP2 Type%d Enabling Failed. (%d)\n",
@@ -1789,11 +1807,16 @@ 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->port_data;int ret;drm_dbg_kms (&i915->drm,"[%s:%d] HDCP2.2 is being Disabled\n" , connector->base.name, connector->base.base.id); + data->k--; +if (drm_WARN_ON (&i915->drm, data->k <0 )) +return -EINVAL ; ret =hdcp2_disable_encryption (connector);
@@ -1996,7 +2019,7 @@ static int initialize_hdcp_port_data(struct intel_connector *connector, data->protocol = (u8 )shim->protocol;if (!data->streams) - data->streams =kcalloc (INTEL_NUM_PIPES , + data->streams =kcalloc (INTEL_NUM_PIPES (dev_priv),sizeof (struct hdcp2_streamid_type ),GFP_KERNEL );if (!data->streams) {
drivers/misc/mei/hdcp/mei_hdcp.c +1 -1
@@ -637,7 +637,7 @@ static int mei_hdcp_enable_authentication(struct device *dev, enable_auth_in.port.integrated_port_type = data->port_type; enable_auth_in.port.physical_port = (u8 )data->fw_ddi; enable_auth_in.port.attached_transcoder = (u8 )data->fw_tc; - enable_auth_in.stream_type = data->streams[0 ].stream_type; + enable_auth_in.stream_type = data->streams[data->k -1 ].stream_type; byte =mei_cldev_send (cldev, (u8 *)&enable_auth_in,sizeof (enable_auth_in));
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: This is based upon actual H/W MST streams capacity. +* +* This is should 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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 3/6 drm/i915/hdcp: Pass connector to check_2_2_link
In reply to Anshuman GuptaThis requires for HDCP 2.2 MST check link.
--- 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
@@ -353,7 +353,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
@@ -1860,7 +1860,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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 4/6 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
@@ -9857,6 +9857,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
@@ -9896,6 +9897,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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 5/6 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.
--- .../drm/i915/display/intel_display_types.h | 4 + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 81 +++++++++++++++++-- 2 files changed, 77 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +4 -0
@@ -352,6 +352,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_digital_port *dig_port, +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 +73 -8
104 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 6/6 drm/i915/hdcp: Enable HDCP 2.2 MST support
In reply to Anshuman GuptaEnable HDCP 2.2 over DP MST.
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +18 -1
@@ -1698,6 +1698,14 @@ static int hdcp2_enable_encryption(struct intel_connector *connector)LINK_ENCRYPTION_STATUS , HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS); +if (hdcp->shim->stream_2_2_encryption) { + ret = hdcp->shim->stream_2_2_encryption (dig_port, true); +if (ret) { +drm_err (&dev_priv->drm,"Failed to enable HDCP 2.2 stream enc\n" ); +return ret; + } + } +return ret; }
@@ -1810,6 +1818,7 @@ 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->port_data; +struct intel_hdcp *hdcp = &connector->hdcp;int ret; drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is being Disabled\n",
@@ -1818,6 +1827,14 @@ static int _intel_hdcp2_disable(struct intel_connector *connector)if (drm_WARN_ON (&i915->drm, data->k <0 ))return -EINVAL ; +if (dig_port->num_hdcp_streams >0 && hdcp->shim->stream_2_2_encryption) { + ret = hdcp->shim->stream_2_2_encryption (dig_port, false); +if (ret) { +drm_err (&i915->drm,"Failed to disable HDCP 2.2 stream enc\n" ); +return ret; + } + } + ret =hdcp2_disable_encryption (connector);if (hdcp2_deauthenticate_port (connector) <0 )
@@ -2097,7 +2114,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, port, shim); ret =
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for HDCP 2.2 DP MST Support
In reply to Anshuman Gupta== Series Details ==
== Series Details ==
Series: HDCP 2.2 DP MST Support
URL : https://patchwork.freedesktop.org/series/81538/
State : failure
== Summary ==
Applying: drm/i915/hdcp: Encapsulate hdcp_port_data to dig_port Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_display_types.h
M drivers/gpu/drm/i915/display/intel_hdcp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/hdcp: Encapsulate hdcp_port_data to dig_port When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines · Anshuman Gupta
This is RFC proposal to support HDCP 2.2 on DP MST. This series is built on below series using the common functionality of HDCP stream encryption.
Before I get into the series, what is the plan for CI coverage for HDCP DP MST, w.r.t igt and hw.
Ram
Quoted 9 lines
Anshuman Gupta (6):
drm/i915/hdcp: Encapsulatehdcp_port_datatodig_portdrm/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 12 lines
.../drm/i915/display/intel_display_types.h | 9 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 84 +++++++++++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 114 +++++++++++++----- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- drivers/gpu/drm/i915/i915_reg.h | 30 +++++ drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- include/drm/drm_hdcp.h | 8 +- 7 files changed, 204 insertions(+), 46 deletions(-)Signature · 1 line
2.26.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Ramalingam C
Quoted 3 lines · Anshuman Gupta
This is RFC proposal to support HDCP 2.2 on DP MST. This series is built on below series using the common functionality of HDCP stream encryption.
Before I get into the series, what is the plan for CI coverage for HDCP DP MST, w.r.t igt and hw.
Hi Ram,
We have ordered a benq DP MST panel which supports HDCP 2.2
https://www.benq.com/en-in/monitor/designer/pd2700u.html
once we will recevie the panel, i will test my patches. Subsequently we will request CI team to procure similar panel. Thanks,
Anshuman Gupta.
Quoted 23 lines
Ram
Quoted 21 lines
Anshuman Gupta (6):
drm/i915/hdcp: Encapsulatehdcp_port_datatodig_portdrm/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.../drm/i915/display/intel_display_types.h | 9 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 84 +++++++++++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 114 +++++++++++++----- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- drivers/gpu/drm/i915/i915_reg.h | 30 +++++ drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- include/drm/drm_hdcp.h | 8 +- 7 files changed, 204 insertions(+), 46 deletions(-)Signature · 1 line
2.26.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx