drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+
Subsystems (5)
v10 cover drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+
Enabling the HDCP1.4 and 2.2 on TGL by supporting the HW block movement from DDI into transcoder.
v10:
Review comments from shashank addressed
Ramalingam C (6):
drm/i915: mei_hdcp: I915 sends ddi index as per ME FW
drm: Move port definition back to i915 header
drm: Extend I915 mei interface for transcoder info misc/mei/hdcp: Fill transcoder index in port info drm/i915/hdcp: update current transcoder into intel_hdcp drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+
drivers/gpu/drm/i915/display/intel_bios.h | 1 + drivers/gpu/drm/i915/display/intel_display.h | 18 ++ .../drm/i915/display/intel_display_types.h | 7 + drivers/gpu/drm/i915/display/intel_dp.c | 3 + drivers/gpu/drm/i915/display/intel_dp.h | 1 + drivers/gpu/drm/i915/display/intel_hdcp.c | 212 +++++++++++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 4 + drivers/gpu/drm/i915/display/intel_hdmi.c | 13 +- drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + drivers/gpu/drm/i915/display/intel_hotplug.h | 1 + drivers/gpu/drm/i915/display/intel_sdvo.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 124 +++++++++- drivers/misc/mei/hdcp/mei_hdcp.c | 45 ++-- drivers/misc/mei/hdcp/mei_hdcp.h | 16 +- include/drm/i915_drm.h | 18 -- include/drm/i915_mei_hdcp_interface.h | 29 ++- 16 files changed, 372 insertions(+), 122 deletions(-)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 1/6 drm/i915: mei_hdcp: I915 sends ddi index as per ME FW
I915 converts it's port value into ddi index defiend by ME FW and pass it as a member of hdcp_port_data structure.
Hence expose the enum mei_fw_ddi to I915 throughi915_mei_interface.h.
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 15 +++++++++- drivers/misc/mei/hdcp/mei_hdcp.c | 34 ++++++++--------------- drivers/misc/mei/hdcp/mei_hdcp.h | 12 -------- include/drm/i915_mei_hdcp_interface.h | 16 +++++++++-- 4 files changed, 39 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +14 -1
@@ -1749,13 +1749,26 @@ static const struct component_ops i915_hdcp_component_ops = { .unbind = i915_hdcp_component_unbind, }; +static inline +enum mei_fw_ddi intel_get_mei_fw_ddi_index (enum port port) +{ +switch (port) { +case PORT_A : +return MEI_DDI_A ; + case PORT_B ... PORT_F: +return (enum mei_fw_ddi )port; +default : +return MEI_DDI_INVALID_PORT ; + } +} +static inline int initialize_hdcp_port_data (struct intel_connector *connector,const struct intel_hdcp_shim *shim) {struct intel_hdcp *hdcp = &connector->hdcp;struct hdcp_port_data *data = &hdcp->port_data; - data->port = connector->encoder->port; + data->fw_ddi =intel_get_mei_fw_ddi_index (connector->encoder->port); data->port_type = (u8 )HDCP_PORT_TYPE_INTEGRATED ; data->protocol = (u8 )shim->protocol;
drivers/misc/mei/hdcp/mei_hdcp.c +11 -23
@@ -27,18 +27,6 @@#include "mei_hdcp.h" -static inline u8 mei_get_ddi_index (enum port port) -{ -switch (port) { -case PORT_A : -return MEI_DDI_A ; - case PORT_B ... PORT_F: -return (u8 )port; -default : -return MEI_DDI_INVALID_PORT ; - } -} -/** * mei_hdcp_initiate_session() - Initiate a Wired HDCP2.2 Tx Session in ME FW * @dev: device corresponding to the mei_cl_device
@@ -69,7 +57,7 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN ; session_init_in.port.integrated_port_type = data->port_type; - session_init_in.port.physical_port =mei_get_ddi_index (data->port); + session_init_in.port.physical_port = (u8 )data->fw_ddi; session_init_in.protocol = data->protocol; byte = mei_cldev_send(cldev, (u8 *)&session_init_in,
@@ -138,7 +126,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN ; verify_rxcert_in.port.integrated_port_type = data->port_type; - verify_rxcert_in.port.physical_port =mei_get_ddi_index (data->port); + verify_rxcert_in.port.physical_port = (u8 )data->fw_ddi; verify_rxcert_in.cert_rx = rx_cert->cert_rx;memcpy (verify_rxcert_in.r_rx, &rx_cert->r_rx,HDCP_2_2_RRX_LEN );
@@ -208,7 +196,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data, send_hprime_in.header.buffer_len =WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN ; send_hprime_in.port.integrated_port_type = data->port_type; - send_hprime_in.port.physical_port =mei_get_ddi_index (data->port); + send_hprime_in.port.physical_port = (u8 )data->fw_ddi;memcpy (send_hprime_in.h_prime, rx_hprime->h_prime,HDCP_2_2_H_PRIME_LEN );
@@ -265,7 +253,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN ; pairing_info_in.port.integrated_port_type = data->port_type; - pairing_info_in.port.physical_port =mei_get_ddi_index (data->port); + pairing_info_in.port.physical_port = (u8 )data->fw_ddi;memcpy (pairing_info_in.e_kh_km, pairing_info->e_kh_km,HDCP_2_2_E_KH_KM_LEN );
@@ -323,7 +311,7 @@ mei_hdcp_initiate_locality_check(struct device *dev, lc_init_in.header.buffer_len =WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN ; lc_init_in.port.integrated_port_type = data->port_type; - lc_init_in.port.physical_port =mei_get_ddi_index (data->port); + lc_init_in.port.physical_port = (u8 )data->fw_ddi; byte =mei_cldev_send (cldev, (u8 *)&lc_init_in,sizeof (lc_init_in));if (byte <0 ) {
@@ -378,7 +366,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN ; verify_lprime_in.port.integrated_port_type = data->port_type; - verify_lprime_in.port.physical_port =mei_get_ddi_index (data->port); + verify_lprime_in.port.physical_port = (u8 )data->fw_ddi;memcpy (verify_lprime_in.l_prime, rx_lprime->l_prime,HDCP_2_2_L_PRIME_LEN );
@@ -435,7 +423,7 @@ static int mei_hdcp_get_session_key(struct device *dev, get_skey_in.header.buffer_len =WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN ; get_skey_in.port.integrated_port_type = data->port_type; - get_skey_in.port.physical_port =mei_get_ddi_index (data->port); + get_skey_in.port.physical_port = (u8 )data->fw_ddi; byte =mei_cldev_send (cldev, (u8 *)&get_skey_in,sizeof (get_skey_in));if (byte <0 ) {
@@ -499,7 +487,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN ; verify_repeater_in.port.integrated_port_type = data->port_type; - verify_repeater_in.port.physical_port =mei_get_ddi_index (data->port); + verify_repeater_in.port.physical_port = (u8 )data->fw_ddi;memcpy (verify_repeater_in.rx_info, rep_topology->rx_info,HDCP_2_2_RXINFO_LEN );
@@ -569,7 +557,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_MIN_IN ; verify_mprime_in.port.integrated_port_type = data->port_type; - verify_mprime_in.port.physical_port =mei_get_ddi_index (data->port); + verify_mprime_in.port.physical_port = (u8 )data->fw_ddi;memcpy (verify_mprime_in.m_prime, stream_ready->m_prime,HDCP_2_2_MPRIME_LEN );
@@ -630,7 +618,7 @@ static int mei_hdcp_enable_authentication(struct device *dev, enable_auth_in.header.buffer_len =WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN ; enable_auth_in.port.integrated_port_type = data->port_type; - enable_auth_in.port.physical_port =mei_get_ddi_index (data->port); + enable_auth_in.port.physical_port = (u8 )data->fw_ddi; enable_auth_in.stream_type = data->streams[0 ].stream_type; byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in,
@@ -684,7 +672,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN ; session_close_in.port.integrated_port_type = data->port_type; - session_close_in.port.physical_port =mei_get_ddi_index (data->port); + session_close_in.port.physical_port = (u8 )data->fw_ddi; byte =mei_cldev_send (cldev, (u8 *)&session_close_in,sizeof (session_close_in));
drivers/misc/mei/hdcp/mei_hdcp.h +0 -12
@@ -362,16 +362,4 @@ struct wired_cmd_repeater_auth_stream_req_out {struct hdcp_cmd_header header; struct hdcp_port_id port; } __packed; - -enum mei_fw_ddi { -MEI_DDI_INVALID_PORT =0x0 , - -MEI_DDI_B =1 , -MEI_DDI_C , -MEI_DDI_D , -MEI_DDI_E , -MEI_DDI_F , -MEI_DDI_A =7 , -MEI_DDI_RANGE_END =MEI_DDI_A , -};#endif /* __MEI_HDCP_H__ */
include/drm/i915_mei_hdcp_interface.h +14 -2
@@ -42,9 +42,21 @@ enum hdcp_wired_protocol { HDCP_PROTOCOL_DP }; +enum mei_fw_ddi { +MEI_DDI_INVALID_PORT =0x0 , + +MEI_DDI_B =1 , +MEI_DDI_C , +MEI_DDI_D , +MEI_DDI_E , +MEI_DDI_F , +MEI_DDI_A =7 , +MEI_DDI_RANGE_END =MEI_DDI_A , +}; +/** * struct hdcp_port_data - intel specific HDCP port data -* @port: port index as per I915 +* @fw_ddi: ddi index as per ME FW * @port_type: HDCP port type as per ME FW classification * @protocol: HDCP adaptation as per ME FW * @k: No of streams transmitted on a port. Only on DP MST this is != 1
@@ -56,7 +68,7 @@ enum hdcp_wired_protocol {* streams */ struct hdcp_port_data { -enum port port; +enum mei_fw_ddi fw_ddi;u8 port_type;u8 protocol;u16 k;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 2/6 drm: Move port definition back to i915 header
In reply to Ramalingam CWe dont need the definition of the enum port outside I915, anymore. Hence move enum port definition into I915 driver itself.
v2:
intel_display.h is included in intel_hdcp.h
v3:
enum port is declared in headers.
v4:
commit msg is rephrased.
--- drivers/gpu/drm/i915/display/intel_bios.h | 1 + drivers/gpu/drm/i915/display/intel_display.h | 18 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.h | 1 + drivers/gpu/drm/i915/display/intel_hdcp.h | 1 + drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + drivers/gpu/drm/i915/display/intel_hotplug.h | 1 + drivers/gpu/drm/i915/display/intel_sdvo.h | 1 + include/drm/i915_drm.h | 18 ------------------ 8 files changed, 24 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/display/intel_bios.h +1 -0
@@ -35,6 +35,7 @@#include <drm/i915_drm.h> struct drm_i915_private ; +enum port ;enum intel_backlight_type {INTEL_BACKLIGHT_PMIC ,
drivers/gpu/drm/i915/display/intel_display.h +18 -0
@@ -182,6 +182,24 @@ enum plane_id {for ((__p) =PLANE_PRIMARY ; (__p) <I915_MAX_PLANES ; (__p)++) \ for_each_if((__crtc)->plane_ids_mask & BIT(__p)) +enum port { +PORT_NONE =-1 , + +PORT_A =0 , +PORT_B , +PORT_C , +PORT_D , +PORT_E , +PORT_F , +PORT_G , +PORT_H , +PORT_I , + +I915_MAX_PORTS +}; + +#define port_name (p) ((p) + 'A') +/* * Ports identifier referenced from other drivers. * Expected to remain stable over time
drivers/gpu/drm/i915/display/intel_dp.h +1 -0
@@ -13,6 +13,7 @@#include "i915_reg.h" enum pipe ; +enum port ;struct drm_connector_state ;struct drm_encoder ;struct drm_i915_private ;
drivers/gpu/drm/i915/display/intel_hdcp.h +1 -0
@@ -15,6 +15,7 @@ struct drm_connector_state;struct drm_i915_private ;struct intel_connector ;struct intel_hdcp_shim ; +enum port ; void intel_hdcp_atomic_check(struct drm_connector *connector, struct drm_connector_state *old_state,
drivers/gpu/drm/i915/display/intel_hdmi.h +1 -0
@@ -23,6 +23,7 @@ struct intel_crtc_state;struct intel_hdmi ;struct drm_connector_state ;union hdmi_infoframe ; +enum port ;void intel_hdmi_init (struct drm_i915_private *dev_priv,i915_reg_t hdmi_reg,enum port port);
drivers/gpu/drm/i915/display/intel_hotplug.h +1 -0
@@ -13,6 +13,7 @@struct drm_i915_private ;struct intel_connector ;struct intel_encoder ; +enum port ;void intel_hpd_poll_init (struct drm_i915_private *dev_priv); enum intel_hotplug_state intel_encoder_hotplug(struct intel_encoder *encoder,
drivers/gpu/drm/i915/display/intel_sdvo.h +1 -0
@@ -14,6 +14,7 @@struct drm_i915_private ;enum pipe ; +enum port ;bool intel_sdvo_port_enabled (struct drm_i915_private *dev_priv,i915_reg_t sdvo_reg,enum pipe *pipe);
include/drm/i915_drm.h +0 -18
@@ -100,22 +100,4 @@ extern struct resource intel_graphics_stolen_res;#define INTEL_GEN11_BSM_DW1 0xc4#define INTEL_BSM_MASK (-(1u << 20)) -enum port { -PORT_NONE =-1 , - -PORT_A =0 , -PORT_B , -PORT_C , -PORT_D , -PORT_E , -PORT_F , -PORT_G , -PORT_H , -PORT_I , - -I915_MAX_PORTS -}; - -#define port_name (p) ((p) + 'A') -#endif /* _I915_DRM_H_ */
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 3/6 drm: Extend I915 mei interface for transcoder info
In reply to Ramalingam CI915 needs to send the index of the transcoder as per ME FW.
To support this, define enum mei_fw_tc and add as a member into the struct hdcp_port_data.
v2:
Typo in commit msg is fixed [Shashank]
--- include/drm/i915_mei_hdcp_interface.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
include/drm/i915_mei_hdcp_interface.h +13 -0
@@ -54,9 +54,21 @@ enum mei_fw_ddi { MEI_DDI_RANGE_END = MEI_DDI_A, }; +enum mei_fw_tc { +MEI_INVALID_TRANSCODER =0x00 ,/* Invalid transcoder type */ +MEI_TC_EDP ,/* Transcoder for eDP */ +MEI_TC_DSI0 ,/* Transcoder for DSI0 */ +MEI_TC_DSI1 ,/* Transcoder for DSI1 */ +MEI_TC_A =0x10 ,/* Transcoder TCA */ +MEI_TC_B ,/* Transcoder TCB */ +MEI_TC_C ,/* Transcoder TCC */ +MEI_TC_D /* Transcoder TCD */ +}; +/** * struct hdcp_port_data - intel specific HDCP port data * @fw_ddi: ddi index as per ME FW +* @fw_tc: transcoder index as per ME FW * @port_type: HDCP port type as per ME FW classification * @protocol: HDCP adaptation as per ME FW * @k: No of streams transmitted on a port. Only on DP MST this is != 1
@@ -69,6 +81,7 @@ enum mei_fw_ddi {*/ struct hdcp_port_data {enum mei_fw_ddi fw_ddi; +enum mei_fw_tc fw_tc;u8 port_type;u8 protocol;u16 k;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
RE: [PATCH v10 3/6] drm: Extend I915 mei interface for transcoder info
Quoted 24 lines
I915 needs to send the index of the transcoder as per ME FW.
To support this, define enum
mei_fw_tcand add as a member into the structhdcp_port_data.v2:
Typo in commit msg is fixed [Shashank]Signed-off-by Ramalingam C <[email protected]>Acked-by Jani Nikula <[email protected]>--- include/drm/i915_mei_hdcp_interface.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)include/drm/i915_mei_hdcp_interface.h +0
-0@@ -54,9 +54,21 @@ enum mei_fw_ddi { MEI_DDI_RANGE_END = MEI_DDI_A, };
include/drm/i915_mei_hdcp_interface.h enum mei_fw_ddi { · line 66
Quoted 10 lines
include/drm/i915_mei_hdcp_interface.h +10
-0+enum mei_fw_tc { +MEI_INVALID_TRANSCODER =0x00 ,/* Invalid transcoder type */ +MEI_TC_EDP ,/* Transcoder for eDP */ +MEI_TC_DSI0 ,/* Transcoder for DSI0 */ +MEI_TC_DSI1 ,/* Transcoder for DSI1 */ +MEI_TC_A =0x10 ,/* Transcoder TCA */ +MEI_TC_B ,/* Transcoder TCB */ +MEI_TC_C ,/* Transcoder TCC */ +MEI_TC_D /* Transcoder TCD */ +};
You should use kdoc format here, please. https://www.kernel.org/doc/html/v5.2/doc-guide/kernel-doc.html
Also TCA just means Transcoder A or TC has other meaning?
Quoted 17 lines
include/drm/i915_mei_hdcp_interface.h +2
-0+/** * struct hdcp_port_data - intel specific HDCP port data * @fw_ddi: ddi index as per ME FW +* @fw_tc: transcoder index as per ME FW * @port_type: HDCP port type as per ME FW classification * @protocol: HDCP adaptation as per ME FW * @k: No of streams transmitted on a port. Only on DP MST this is != 1 @@ - 69,6 +81,7 @@ enum
mei_fw_ddi{
*/
structhdcp_port_data{include/drm/i915_mei_hdcp_interface.h +1
-1enum mei_fw_ddi fw_ddi; +enum mei_fw_tc fw_tc;u8 port_type;u8 protocol;u16 k; --
Quoted 1 line
2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v10 3/6] drm: Extend I915 mei interface for transcoder info
Quoted 24 lines · Tomas
Quoted 24 lines
I915 needs to send the index of the transcoder as per ME FW.
To support this, define enum
mei_fw_tcand add as a member into the structhdcp_port_data.v2:
Typo in commit msg is fixed [Shashank]Signed-off-by Ramalingam C <[email protected]>Acked-by Jani Nikula <[email protected]>--- include/drm/i915_mei_hdcp_interface.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)include/drm/i915_mei_hdcp_interface.h +0
-0@@ -54,9 +54,21 @@ enum mei_fw_ddi { MEI_DDI_RANGE_END = MEI_DDI_A, };
Quoted 13 lines
include/drm/i915_mei_hdcp_interface.h enum mei_fw_ddi { · line 66
Quoted 10 lines
include/drm/i915_mei_hdcp_interface.h +10
-0+enum mei_fw_tc { +MEI_INVALID_TRANSCODER =0x00 ,/* Invalid transcoder type */ +MEI_TC_EDP ,/* Transcoder for eDP */ +MEI_TC_DSI0 ,/* Transcoder for DSI0 */ +MEI_TC_DSI1 ,/* Transcoder for DSI1 */ +MEI_TC_A =0x10 ,/* Transcoder TCA */ +MEI_TC_B ,/* Transcoder TCB */ +MEI_TC_C ,/* Transcoder TCC */ +MEI_TC_D /* Transcoder TCD */ +};You should use kdoc format here, please. https://www.kernel.org/doc/html/v5.2/doc-guide/kernel-doc.html
Also TCA just means Transcoder A or TC has other meaning?
TCA stands for TRANSCODER A only. Sure I will use kdoc format.
-Ram
Quoted 11 lines
Quoted 11 lines
include/drm/i915_mei_hdcp_interface.h +2
-0+/** * struct hdcp_port_data - intel specific HDCP port data * @fw_ddi: ddi index as per ME FW +* @fw_tc: transcoder index as per ME FW * @port_type: HDCP port type as per ME FW classification * @protocol: HDCP adaptation as per ME FW * @k: No of streams transmitted on a port. Only on DP MST this is != 1 @@ - 69,6 +81,7 @@ enum
mei_fw_ddi{
*/
Quoted 9 lines
Quoted 8 lines
struct
hdcp_port_data{include/drm/i915_mei_hdcp_interface.h +1
-1enum mei_fw_ddi fw_ddi; +enum mei_fw_tc fw_tc;u8 port_type;u8 protocol;u16 k; --2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 4/6 misc/mei/hdcp: Fill transcoder index in port info
In reply to Ramalingam CFor gen12+ platform we need to pass the transcoder info as part of the port info into ME FW.
This change fills the payload for ME FW from hdcp_port_data.
--- drivers/misc/mei/hdcp/mei_hdcp.c | 11 +++++++++++ drivers/misc/mei/hdcp/mei_hdcp.h | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/misc/mei/hdcp/mei_hdcp.c +11 -0
@@ -58,6 +58,7 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data, session_init_in.port.integrated_port_type = data->port_type; session_init_in.port.physical_port = (u8 )data->fw_ddi; + session_init_in.port.attached_transcoder = (u8 )data->fw_tc; session_init_in.protocol = data->protocol; byte = mei_cldev_send(cldev, (u8 *)&session_init_in,
@@ -127,6 +128,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev, verify_rxcert_in.port.integrated_port_type = data->port_type; verify_rxcert_in.port.physical_port = (u8 )data->fw_ddi; + verify_rxcert_in.port.attached_transcoder = (u8 )data->fw_tc; verify_rxcert_in.cert_rx = rx_cert->cert_rx;memcpy (verify_rxcert_in.r_rx, &rx_cert->r_rx,HDCP_2_2_RRX_LEN );
@@ -197,6 +199,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data, send_hprime_in.port.integrated_port_type = data->port_type; send_hprime_in.port.physical_port = (u8 )data->fw_ddi; + send_hprime_in.port.attached_transcoder = (u8 )data->fw_tc;memcpy (send_hprime_in.h_prime, rx_hprime->h_prime,HDCP_2_2_H_PRIME_LEN );
@@ -254,6 +257,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data, pairing_info_in.port.integrated_port_type = data->port_type; pairing_info_in.port.physical_port = (u8 )data->fw_ddi; + pairing_info_in.port.attached_transcoder = (u8 )data->fw_tc;memcpy (pairing_info_in.e_kh_km, pairing_info->e_kh_km,HDCP_2_2_E_KH_KM_LEN );
@@ -312,6 +316,7 @@ mei_hdcp_initiate_locality_check(struct device *dev, lc_init_in.port.integrated_port_type = data->port_type; lc_init_in.port.physical_port = (u8 )data->fw_ddi; + lc_init_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&lc_init_in,sizeof (lc_init_in));if (byte <0 ) {
@@ -367,6 +372,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data, verify_lprime_in.port.integrated_port_type = data->port_type; verify_lprime_in.port.physical_port = (u8 )data->fw_ddi; + verify_lprime_in.port.attached_transcoder = (u8 )data->fw_tc;memcpy (verify_lprime_in.l_prime, rx_lprime->l_prime,HDCP_2_2_L_PRIME_LEN );
@@ -424,6 +430,7 @@ static int mei_hdcp_get_session_key(struct device *dev, get_skey_in.port.integrated_port_type = data->port_type; get_skey_in.port.physical_port = (u8 )data->fw_ddi; + get_skey_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&get_skey_in,sizeof (get_skey_in));if (byte <0 ) {
@@ -488,6 +495,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev, verify_repeater_in.port.integrated_port_type = data->port_type; verify_repeater_in.port.physical_port = (u8 )data->fw_ddi; + verify_repeater_in.port.attached_transcoder = (u8 )data->fw_tc;memcpy (verify_repeater_in.rx_info, rep_topology->rx_info,HDCP_2_2_RXINFO_LEN );
@@ -558,6 +566,7 @@ static int mei_hdcp_verify_mprime(struct device *dev, verify_mprime_in.port.integrated_port_type = data->port_type; verify_mprime_in.port.physical_port = (u8 )data->fw_ddi; + verify_mprime_in.port.attached_transcoder = (u8 )data->fw_tc;memcpy (verify_mprime_in.m_prime, stream_ready->m_prime,HDCP_2_2_MPRIME_LEN );
@@ -619,6 +628,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; byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in,
@@ -673,6 +683,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data) session_close_in.port.integrated_port_type = data->port_type; session_close_in.port.physical_port = (u8 )data->fw_ddi; + session_close_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&session_close_in,sizeof (session_close_in));
drivers/misc/mei/hdcp/mei_hdcp.h +3 -1
@@ -184,8 +184,10 @@ struct hdcp_cmd_no_data {/* Uniquely identifies the hdcp port being addressed for a given command. */ struct hdcp_port_id {u8 integrated_port_type; +/* Used until Gen11.5. Must be zero for Gen11.5+ */ u8 physical_port; -u16 reserved; +u8 attached_transcoder; +u8 reserved; } __packed;/*
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v10 4/6] misc/mei/hdcp: Fill transcoder index in port info
Quoted 120 lines
For gen12+ platform we need to pass the transcoder info as part of the port info into ME FW.
This change fills the payload for ME FW from
hdcp_port_data.Signed-off-by Ramalingam C <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Shashank Sharma <[email protected]>--- drivers/misc/mei/hdcp/mei_hdcp.c | 11 +++++++++++ drivers/misc/mei/hdcp/mei_hdcp.h | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-)drivers/misc/mei/hdcp/mei_hdcp.c +1
-0@@ -58,6 +58,7 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data, session_init_in.port.integrated_port_type = data->port_type; session_init_in.port.physical_port = (u8 )data->fw_ddi; + session_init_in.port.attached_transcoder = (u8 )data->fw_tc; session_init_in.protocol = data->protocol;drivers/misc/mei/hdcp/mei_hdcp.c +3
-0byte = mei_cldev_send(cldev, (u8 *)&session_init_in, @@ -127,6 +128,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev, verify_rxcert_in.port.integrated_port_type = data->port_type; verify_rxcert_in.port.physical_port = (u8)data->fw_ddi; + verify_rxcert_in.port.attached_transcoder = (u8)data->fw_tc; verify_rxcert_in.cert_rx = rx_cert->cert_rx; memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN);@@ -197,6 +199,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data, send_hprime_in.port.integrated_port_type = data->port_type; send_hprime_in.port.physical_port = (u8 )data->fw_ddi; + send_hprime_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_H_PRIME_LEN);@@ -254,6 +257,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data, pairing_info_in.port.integrated_port_type = data->port_type; pairing_info_in.port.physical_port = (u8 )data->fw_ddi; + pairing_info_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,drivers/misc/mei/hdcp/mei_hdcp.c +2
-0HDCP_2_2_E_KH_KM_LEN);@@ -312,6 +316,7 @@ mei_hdcp_initiate_locality_check(struct device *dev, lc_init_in.port.integrated_port_type = data->port_type; lc_init_in.port.physical_port = (u8 )data->fw_ddi; + lc_init_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&lc_init_in,sizeof (lc_init_in));if (byte <0 ) {@@ -367,6 +372,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data, verify_lprime_in.port.integrated_port_type = data->port_type; verify_lprime_in.port.physical_port = (u8 )data->fw_ddi; + verify_lprime_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_L_PRIME_LEN);@@ -424,6 +430,7 @@ static int mei_hdcp_get_session_key(struct device *dev, get_skey_in.port.integrated_port_type = data->port_type; get_skey_in.port.physical_port = (u8 )data->fw_ddi; + get_skey_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&get_skey_in,sizeof (get_skey_in));drivers/misc/mei/hdcp/mei_hdcp.c +1
-0if (byte <0 ) {@@ -488,6 +495,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev, verify_repeater_in.port.integrated_port_type = data->port_type; verify_repeater_in.port.physical_port = (u8 )data->fw_ddi; + verify_repeater_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,drivers/misc/mei/hdcp/mei_hdcp.c +2
-0HDCP_2_2_RXINFO_LEN);@@ -558,6 +566,7 @@ static int mei_hdcp_verify_mprime(struct device *dev, verify_mprime_in.port.integrated_port_type = data->port_type; verify_mprime_in.port.physical_port = (u8 )data->fw_ddi; + verify_mprime_in.port.attached_transcoder = (u8 )data->fw_tc;memcpy (verify_mprime_in.m_prime, stream_ready->m_prime,HDCP_2_2_MPRIME_LEN );@@ -619,6 +628,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;byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in, @@ -673,6
+683,7 @@mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)drivers/misc/mei/hdcp/mei_hdcp.c +1
-0session_close_in.port.integrated_port_type = data->port_type; session_close_in.port.physical_port = (u8 )data->fw_ddi; + session_close_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&session_close_in,sizeof (session_close_in));drivers/misc/mei/hdcp/mei_hdcp.h +0
-0
drivers/misc/mei/hdcp/mei_hdcp.h struct hdcp_cmd_no_data { · line 187
Quoted 4 lines
drivers/misc/mei/hdcp/mei_hdcp.h +1
-0@@ -184,8 +184,10 @@ struct hdcp_cmd_no_data {/* Uniquely identifies the hdcp port being addressed for a given command. */ struct hdcp_port_id {u8 integrated_port_type; +/* Used until Gen11.5. Must be zero for Gen11.5+ */
What are you reference here, the member bellow or above? - It is better to document it in using kdoc! Next, what part of the code is validating this?
drivers/misc/mei/hdcp/mei_hdcp.h struct hdcp_cmd_no_data {
Quoted 4 lines
drivers/misc/mei/hdcp/mei_hdcp.h +1
-1u8 physical_port; -u16 reserved; +u8 attached_transcoder;
Also here need the documentation
Quoted 6 lines
drivers/misc/mei/hdcp/mei_hdcp.h +1
-0+u8 reserved; } __packed;/*
--
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v10 4/6] misc/mei/hdcp: Fill transcoder index in port info
Quoted 112 lines · Tomas
Quoted 112 lines
For gen12+ platform we need to pass the transcoder info as part of the port info into ME FW.
This change fills the payload for ME FW from
hdcp_port_data.Signed-off-by Ramalingam C <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Shashank Sharma <[email protected]>--- drivers/misc/mei/hdcp/mei_hdcp.c | 11 +++++++++++ drivers/misc/mei/hdcp/mei_hdcp.h | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-)drivers/misc/mei/hdcp/mei_hdcp.c +1
-0@@ -58,6 +58,7 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data, session_init_in.port.integrated_port_type = data->port_type; session_init_in.port.physical_port = (u8 )data->fw_ddi; + session_init_in.port.attached_transcoder = (u8 )data->fw_tc; session_init_in.protocol = data->protocol;drivers/misc/mei/hdcp/mei_hdcp.c +3
-0byte = mei_cldev_send(cldev, (u8 *)&session_init_in, @@ -127,6 +128,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev, verify_rxcert_in.port.integrated_port_type = data->port_type; verify_rxcert_in.port.physical_port = (u8)data->fw_ddi; + verify_rxcert_in.port.attached_transcoder = (u8)data->fw_tc; verify_rxcert_in.cert_rx = rx_cert->cert_rx; memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN);@@ -197,6 +199,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data, send_hprime_in.port.integrated_port_type = data->port_type; send_hprime_in.port.physical_port = (u8 )data->fw_ddi; + send_hprime_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_H_PRIME_LEN);@@ -254,6 +257,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data, pairing_info_in.port.integrated_port_type = data->port_type; pairing_info_in.port.physical_port = (u8 )data->fw_ddi; + pairing_info_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,drivers/misc/mei/hdcp/mei_hdcp.c +2
-0HDCP_2_2_E_KH_KM_LEN);@@ -312,6 +316,7 @@ mei_hdcp_initiate_locality_check(struct device *dev, lc_init_in.port.integrated_port_type = data->port_type; lc_init_in.port.physical_port = (u8 )data->fw_ddi; + lc_init_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&lc_init_in,sizeof (lc_init_in));if (byte <0 ) {@@ -367,6 +372,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data, verify_lprime_in.port.integrated_port_type = data->port_type; verify_lprime_in.port.physical_port = (u8 )data->fw_ddi; + verify_lprime_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_L_PRIME_LEN);@@ -424,6 +430,7 @@ static int mei_hdcp_get_session_key(struct device *dev, get_skey_in.port.integrated_port_type = data->port_type; get_skey_in.port.physical_port = (u8 )data->fw_ddi; + get_skey_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&get_skey_in,sizeof (get_skey_in));drivers/misc/mei/hdcp/mei_hdcp.c +1
-0if (byte <0 ) {@@ -488,6 +495,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev, verify_repeater_in.port.integrated_port_type = data->port_type; verify_repeater_in.port.physical_port = (u8 )data->fw_ddi; + verify_repeater_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,drivers/misc/mei/hdcp/mei_hdcp.c +2
-0HDCP_2_2_RXINFO_LEN);@@ -558,6 +566,7 @@ static int mei_hdcp_verify_mprime(struct device *dev, verify_mprime_in.port.integrated_port_type = data->port_type; verify_mprime_in.port.physical_port = (u8 )data->fw_ddi; + verify_mprime_in.port.attached_transcoder = (u8 )data->fw_tc;memcpy (verify_mprime_in.m_prime, stream_ready->m_prime,HDCP_2_2_MPRIME_LEN );@@ -619,6 +628,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;byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in, @@ -673,6
+683,7 @@mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)drivers/misc/mei/hdcp/mei_hdcp.c +1
-0session_close_in.port.integrated_port_type = data->port_type; session_close_in.port.physical_port = (u8 )data->fw_ddi; + session_close_in.port.attached_transcoder = (u8 )data->fw_tc;
Quoted 14 lines
drivers/misc/mei/hdcp/mei_hdcp.h struct hdcp_cmd_no_data { · line 187
Quoted 12 lines
drivers/misc/mei/hdcp/mei_hdcp.c +0
-0byte =mei_cldev_send (cldev, (u8 *)&session_close_in,sizeof (session_close_in));drivers/misc/mei/hdcp/mei_hdcp.h +1
-0@@ -184,8 +184,10 @@ struct hdcp_cmd_no_data {/* Uniquely identifies the hdcp port being addressed for a given command. */ struct hdcp_port_id {u8 integrated_port_type; +/* Used until Gen11.5. Must be zero for Gen11.5+ */ What are you reference here, the member bellow or above? - It is better to document it in using kdoc! Next, what part of the code is validating this?
This is documentation for physical_port. As these structures are ME FW API payloads, i dont think we need a kdoc on it. Please let me know if you think otherwise.
This is checked at ME FW and returned with ERROR Code. And as only I915 knows the GEN#, i915 takes care of the filling this member with Zero(INVALID_PORT), for gen12+.
Quoted 6 lines
drivers/misc/mei/hdcp/mei_hdcp.h struct hdcp_cmd_no_data {
Quoted 5 lines
drivers/misc/mei/hdcp/mei_hdcp.h +1
-1u8 physical_port; -u16 reserved; +u8 attached_transcoder;Also here need the documentation
In this file we are not documenting each member of the struct. IMHO variable name is self documenting.
Since there was a special expectation on physical port on gen12+, I have added the comment.
-Ram
Quoted 7 lines
Quoted 6 lines
drivers/misc/mei/hdcp/mei_hdcp.h +1
-0+u8 reserved; } __packed;/*
--
2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v10 4/6] misc/mei/hdcp: Fill transcoder index in port info
Quoted 133 lines · Tomas
Quoted 75 lines
Quoted 75 lines
For gen12+ platform we need to pass the transcoder info as part of the port info into ME FW.
This change fills the payload for ME FW from
hdcp_port_data.Signed-off-by Ramalingam C <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Shashank Sharma <[email protected]>--- drivers/misc/mei/hdcp/mei_hdcp.c | 11 +++++++++++ drivers/misc/mei/hdcp/mei_hdcp.h | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-)drivers/misc/mei/hdcp/mei_hdcp.c +1
-0@@ -58,6 +58,7 @@ mei_hdcp_initiate_session(struct device *dev,struct hdcp_port_data *data, session_init_in.port.integrated_port_type = data->port_type; session_init_in.port.physical_port = (u8 )data->fw_ddi; + session_init_in.port.attached_transcoder = (u8 )data->fw_tc; session_init_in.protocol = data->protocol;drivers/misc/mei/hdcp/mei_hdcp.c +4
-0byte = mei_cldev_send(cldev, (u8 *)&session_init_in, @@ -127,6 +128,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device +*dev, verify_rxcert_in.port.integrated_port_type = data->port_type; verify_rxcert_in.port.physical_port = (u8)data->fw_ddi; + verify_rxcert_in.port.attached_transcoder = (u8)data->fw_tc; verify_rxcert_in.cert_rx = rx_cert->cert_rx; memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN);@@ -197,6 +199,7 @@ mei_hdcp_verify_hprime(struct device *dev,struct hdcp_port_data *data, send_hprime_in.port.integrated_port_type = data->port_type; send_hprime_in.port.physical_port = (u8 )data->fw_ddi; + send_hprime_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_H_PRIME_LEN);@@ -254,6 +257,7 @@ mei_hdcp_store_pairing_info(struct device *dev,struct hdcp_port_data *data, pairing_info_in.port.integrated_port_type = data->port_type; pairing_info_in.port.physical_port = (u8 )data->fw_ddi; + pairing_info_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_E_KH_KM_LEN);@@ -312,6 +316,7 @@ mei_hdcp_initiate_locality_check(struct device *dev, lc_init_in.port.integrated_port_type = data->port_type; lc_init_in.port.physical_port = (u8 )data->fw_ddi; + lc_init_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&lc_init_in,sizeof (lc_init_in));drivers/misc/mei/hdcp/mei_hdcp.c +1
-0if (byte <0 ) {@@ -367,6 +372,7 @@ mei_hdcp_verify_lprime(struct device *dev,struct hdcp_port_data *data, verify_lprime_in.port.integrated_port_type = data->port_type; verify_lprime_in.port.physical_port = (u8 )data->fw_ddi; + verify_lprime_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,drivers/misc/mei/hdcp/mei_hdcp.c +0
-0HDCP_2_2_L_PRIME_LEN);@@ -424,6 +430,7 @@ static int mei_hdcp_get_session_key(struct device *dev,Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0get_skey_in.port.integrated_port_type = data->port_type; get_skey_in.port.physical_port = (u8 )data->fw_ddi; + get_skey_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&get_skey_in,sizeof (get_skey_in));drivers/misc/mei/hdcp/mei_hdcp.c +0
-0if (byte <0 ) {@@ -488,6 +495,7 @@mei_hdcp_repeater_check_flow_prepare_ack(struct
Quoted 34 lines
Quoted 34 lines
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0device *dev, verify_repeater_in.port.integrated_port_type = data->port_type; verify_repeater_in.port.physical_port = (u8 )data->fw_ddi; + verify_repeater_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_RXINFO_LEN);@@ -558,6 +566,7 @@ static int mei_hdcp_verify_mprime(struct device *dev, verify_mprime_in.port.integrated_port_type = data->port_type; verify_mprime_in.port.physical_port = (u8 )data->fw_ddi; + verify_mprime_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(verify_mprime_in.m_prime, stream_ready->m_prime,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_MPRIME_LEN);@@ -619,6 +628,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;drivers/misc/mei/hdcp/mei_hdcp.c +2
-0byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in, @@ -673,6 +683,7 @@ mei_hdcp_close_session(struct device *dev, struct +hdcp_port_data*data)
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0session_close_in.port.integrated_port_type = data->port_type; session_close_in.port.physical_port = (u8 )data->fw_ddi; + session_close_in.port.attached_transcoder = (u8 )data->fw_tc;Quoted 13 lines
drivers/misc/mei/hdcp/mei_hdcp.h struct hdcp_cmd_no_data { · line 187
Quoted 12 lines
drivers/misc/mei/hdcp/mei_hdcp.c +0
-0byte =mei_cldev_send (cldev, (u8 *)&session_close_in, sizeof(session_close_in)); diff --git
a/drivers/misc/mei/hdcp/mei_hdcp.hb/drivers/misc/mei/hdcp/mei_hdcp.h
indexe60282eb2d48..58e439d2fc1a100644drivers/misc/mei/hdcp/mei_hdcp.h +1
-0@@ -184,8 +184,10 @@ struct hdcp_cmd_no_data {/* Uniquely identifies the hdcp port being addressed for a given command. */ struct hdcp_port_id {u8 integrated_port_type; +/* Used until Gen11.5. Must be zero for Gen11.5+ */ What are you reference here, the member bellow or above? - It is better to
Quoted 5 lines
document it in using kdoc!
Quoted 1 line
Next, what part of the code is validating this?
This is documentation for
physical_port. As these structures are ME FW API payloads, i dont think we need a kdoc on it. Please let me know if you think otherwise.
I asked for kdoc, because it is not clear from the comment what member are you commenting on, In other words the comment is lacking the subject.
Quoted 11 lines
This is checked at ME FW and returned with ERROR Code.
And as only I915 knows the GEN#, i915 takes care of the filling this member withZero(INVALID_PORT), for gen12+.Quoted 6 lines
drivers/misc/mei/hdcp/mei_hdcp.h struct hdcp_cmd_no_data {
Quoted 5 lines
drivers/misc/mei/hdcp/mei_hdcp.h +1
-1u8 physical_port; -u16 reserved; +u8 attached_transcoder;Also here need the documentation
Quoted 14 lines
In this file we are not documenting each member of the struct. IMHO variable name is self documenting.
Since there was a special expectation on physical port on gen12+, I have added the comment.
-Ram
Quoted 7 lines
Quoted 6 lines
drivers/misc/mei/hdcp/mei_hdcp.h +1
-0+u8 reserved; } __packed;/*
--
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v10 4/6] misc/mei/hdcp: Fill transcoder index in port info
Quoted 133 lines · Tomas
Quoted 133 lines · Tomas
Quoted 75 lines
Quoted 75 lines
For gen12+ platform we need to pass the transcoder info as part of the port info into ME FW.
This change fills the payload for ME FW from
hdcp_port_data.Signed-off-by Ramalingam C <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Shashank Sharma <[email protected]>--- drivers/misc/mei/hdcp/mei_hdcp.c | 11 +++++++++++ drivers/misc/mei/hdcp/mei_hdcp.h | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-)drivers/misc/mei/hdcp/mei_hdcp.c +1
-0@@ -58,6 +58,7 @@ mei_hdcp_initiate_session(struct device *dev,struct hdcp_port_data *data, session_init_in.port.integrated_port_type = data->port_type; session_init_in.port.physical_port = (u8 )data->fw_ddi; + session_init_in.port.attached_transcoder = (u8 )data->fw_tc; session_init_in.protocol = data->protocol;drivers/misc/mei/hdcp/mei_hdcp.c +4
-0byte = mei_cldev_send(cldev, (u8 *)&session_init_in, @@ -127,6 +128,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device +*dev, verify_rxcert_in.port.integrated_port_type = data->port_type; verify_rxcert_in.port.physical_port = (u8)data->fw_ddi; + verify_rxcert_in.port.attached_transcoder = (u8)data->fw_tc; verify_rxcert_in.cert_rx = rx_cert->cert_rx; memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN);@@ -197,6 +199,7 @@ mei_hdcp_verify_hprime(struct device *dev,struct hdcp_port_data *data, send_hprime_in.port.integrated_port_type = data->port_type; send_hprime_in.port.physical_port = (u8 )data->fw_ddi; + send_hprime_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_H_PRIME_LEN);@@ -254,6 +257,7 @@ mei_hdcp_store_pairing_info(struct device *dev,struct hdcp_port_data *data, pairing_info_in.port.integrated_port_type = data->port_type; pairing_info_in.port.physical_port = (u8 )data->fw_ddi; + pairing_info_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_E_KH_KM_LEN);@@ -312,6 +316,7 @@ mei_hdcp_initiate_locality_check(struct device *dev, lc_init_in.port.integrated_port_type = data->port_type; lc_init_in.port.physical_port = (u8 )data->fw_ddi; + lc_init_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&lc_init_in,sizeof (lc_init_in));drivers/misc/mei/hdcp/mei_hdcp.c +1
-0if (byte <0 ) {@@ -367,6 +372,7 @@ mei_hdcp_verify_lprime(struct device *dev,struct hdcp_port_data *data, verify_lprime_in.port.integrated_port_type = data->port_type; verify_lprime_in.port.physical_port = (u8 )data->fw_ddi; + verify_lprime_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,drivers/misc/mei/hdcp/mei_hdcp.c +0
-0HDCP_2_2_L_PRIME_LEN);@@ -424,6 +430,7 @@ static int mei_hdcp_get_session_key(struct device *dev,Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0get_skey_in.port.integrated_port_type = data->port_type; get_skey_in.port.physical_port = (u8 )data->fw_ddi; + get_skey_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&get_skey_in,sizeof (get_skey_in));drivers/misc/mei/hdcp/mei_hdcp.c +0
-0if (byte <0 ) {@@ -488,6 +495,7 @@mei_hdcp_repeater_check_flow_prepare_ack(struct
Quoted 47 lines
Quoted 42 lines
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0device *dev, verify_repeater_in.port.integrated_port_type = data->port_type; verify_repeater_in.port.physical_port = (u8 )data->fw_ddi; + verify_repeater_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_RXINFO_LEN);@@ -558,6 +566,7 @@ static int mei_hdcp_verify_mprime(struct device *dev, verify_mprime_in.port.integrated_port_type = data->port_type; verify_mprime_in.port.physical_port = (u8 )data->fw_ddi; + verify_mprime_in.port.attached_transcoder = (u8 )data->fw_tc; memcpy(verify_mprime_in.m_prime, stream_ready->m_prime,drivers/misc/mei/hdcp/mei_hdcp.c +1
-0HDCP_2_2_MPRIME_LEN);@@ -619,6 +628,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;drivers/misc/mei/hdcp/mei_hdcp.c +2
-0byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in, @@ -673,6 +683,7 @@ mei_hdcp_close_session(struct device *dev, struct +hdcp_port_data*data)
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0session_close_in.port.integrated_port_type = data->port_type; session_close_in.port.physical_port = (u8 )data->fw_ddi; + session_close_in.port.attached_transcoder = (u8 )data->fw_tc; byte =mei_cldev_send (cldev, (u8 *)&session_close_in, sizeof(session_close_in)); diff --git
a/drivers/misc/mei/hdcp/mei_hdcp.hb/drivers/misc/mei/hdcp/mei_hdcp.h
indexe60282eb2d48..58e439d2fc1a100644drivers/misc/mei/hdcp/mei_hdcp.h struct hdcp_cmd_no_data { · line 187
Quoted 4 lines
drivers/misc/mei/hdcp/mei_hdcp.h +1
-0@@ -184,8 +184,10 @@ struct hdcp_cmd_no_data {/* Uniquely identifies the hdcp port being addressed for a given command. */ struct hdcp_port_id {u8 integrated_port_type; +/* Used until Gen11.5. Must be zero for Gen11.5+ */ What are you reference here, the member bellow or above? - It is better to
Quoted 7 lines
Quoted 5 lines
document it in using kdoc!
Quoted 1 line
Next, what part of the code is validating this?
This is documentation for
physical_port. As these structures are ME FW API payloads, i dont think we need a kdoc on it. Please let me know if you think otherwise.I asked for kdoc, because it is not clear from the comment what member are you commenting on, In other words the comment is lacking the subject.
I will rephrase it as /* physical_port is used until Gen11.5. Must be zero for Gen11.5+ */ Hope that looks good to you.
-Ram
Quoted 18 lines
Quoted 18 lines
This is checked at ME FW and returned with ERROR Code.
And as only I915 knows the GEN#, i915 takes care of the filling this member withZero(INVALID_PORT), for gen12+.Quoted 6 lines
drivers/misc/mei/hdcp/mei_hdcp.h struct hdcp_cmd_no_data {
Quoted 5 lines
drivers/misc/mei/hdcp/mei_hdcp.h +1
-1u8 physical_port; -u16 reserved; +u8 attached_transcoder;Also here need the documentation
In this file we are not documenting each member of the struct. IMHO variable name is self documenting.
Since there was a special expectation on physical port on gen12+, I have added the comment.
Quoted 8 lines
Quoted 8 lines
-Ram
Quoted 7 lines
Quoted 6 lines
drivers/misc/mei/hdcp/mei_hdcp.h +1
-0+u8 reserved; } __packed;/*
--
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 5/6 drm/i915/hdcp: update current transcoder into intel_hdcp
In reply to Ramalingam COn gen12+ platforms, HDCP HW is associated to the transcoder. Hence on every modeset update associated transcoder into the intel_hdcp of the port.
v2:
s/trans/cpu_transcoder [Jani]
v3:
comment is added for fw_ddi init for gen12+ [Shashank] only hdcp capable transcoder is translated into fw_tc [Shashank]
--- .../drm/i915/display/intel_display_types.h | 7 +++ drivers/gpu/drm/i915/display/intel_dp.c | 3 ++ drivers/gpu/drm/i915/display/intel_hdcp.c | 47 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_hdcp.h | 3 ++ drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++ 5 files changed, 62 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display_types.h +7 -0
@@ -388,6 +388,13 @@ struct intel_hdcp {wait_queue_head_t cp_irq_queue;atomic_t cp_irq_count;int cp_irq_count_cached; + +/* +* HDCP register access for gen12+ need the transcoder associated. +* Transcoder attached to the connector could be changed at modeset. +* Hence caching the transcoder here. +*/ +enum transcoder cpu_transcoder; };struct intel_connector {
drivers/gpu/drm/i915/display/intel_dp.c +3 -0
@@ -2248,6 +2248,9 @@ intel_dp_compute_config(struct intel_encoder *encoder,intel_psr_compute_config (intel_dp, pipe_config); +intel_hdcp_transcoder_config (intel_connector, + pipe_config->cpu_transcoder); +return 0 ; }
drivers/gpu/drm/i915/display/intel_hdcp.c +46 -1
59 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_hdcp.h +3 -0
@@ -16,10 +16,13 @@ struct drm_i915_private;struct intel_connector ;struct intel_hdcp_shim ;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); +void intel_hdcp_transcoder_config (struct intel_connector *connector, +enum transcoder cpu_transcoder);int intel_hdcp_init (struct intel_connector *connector,const struct intel_hdcp_shim *hdcp_shim);int intel_hdcp_enable (struct intel_connector *connector,u8 content_type);
drivers/gpu/drm/i915/display/intel_hdmi.c +3 -0
@@ -2431,6 +2431,9 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,return -EINVAL ; } +intel_hdcp_transcoder_config (intel_hdmi->attached_connector, + pipe_config->cpu_transcoder); +return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
RE: [PATCH v10 5/6] drm/i915/hdcp: update current transcoder into intel_hdcp
Quoted 102 lines
On gen12+ platforms, HDCP HW is associated to the transcoder. Hence on every modeset update associated transcoder into the
intel_hdcpof the port.v2:
s/trans/cpu_transcoder [Jani]
v3:
comment is added forfw_ddiinit for gen12+ [Shashank] only hdcp capable transcoder is translated intofw_tc[Shashank]Signed-off-by Ramalingam C <[email protected]>Acked-by Jani Nikula <[email protected]>--- .../drm/i915/display/intel_display_types.h | 7 +++ drivers/gpu/drm/i915/display/intel_dp.c | 3 ++ drivers/gpu/drm/i915/display/intel_hdcp.c | 47 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_hdcp.h | 3 ++ drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++ 5 files changed, 62 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_display_types.h +7
-0@@ -388,6 +388,13 @@ struct intel_hdcp {wait_queue_head_t cp_irq_queue;atomic_t cp_irq_count;int cp_irq_count_cached; + +/* +* HDCP register access for gen12+ need the transcoder associated. +* Transcoder attached to the connector could be changed at modeset. +* Hence caching the transcoder here. +*/ +enum transcoder cpu_transcoder; };struct intel_connector {drivers/gpu/drm/i915/display/intel_dp.c +3
-0@@ -2248,6 +2248,9 @@ intel_dp_compute_config(struct intel_encoder *encoder,intel_psr_compute_config (intel_dp, pipe_config); +intel_hdcp_transcoder_config (intel_connector, + pipe_config->cpu_transcoder); +return 0 ; }drivers/gpu/drm/i915/display/intel_hdcp.c +31
-0@@ -1762,13 +1762,58 @@ enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port) } } +static inline +enum mei_fw_tc intel_get_mei_fw_tc (enum transcoder cpu_transcoder) { +switch (cpu_transcoder) { + case TRANSCODER_A ... TRANSCODER_D: +return (enum mei_fw_tc )(cpu_transcoder |0x10 ); +default :/* eDP, DSI TRANSCODERS are non HDCP capable */ +return MEI_INVALID_TRANSCODER ; + } +} + +void intel_hdcp_transcoder_config (struct intel_connector *connector, +enum transcoder cpu_transcoder) +{ +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; + +if (!hdcp->shim) +return ; + +if (INTEL_GEN (dev_priv) >=12 ) { +mutex_lock (&hdcp->mutex); + hdcp->cpu_transcoder = cpu_transcoder; + hdcp->port_data.fw_tc =intel_get_mei_fw_tc (cpu_transcoder); +mutex_unlock (&hdcp->mutex); + } +} +static inline int initialize_hdcp_port_data (struct intel_connector *connector,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; +struct intel_crtc *crtc; + +if (INTEL_GEN (dev_priv) <12 ) {
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi · line 1812
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +8
-0+ data->fw_ddi = +intel_get_mei_fw_ddi_index (connector->encoder- >port); + }else { + crtc =to_intel_crtc (connector->base.state->crtc); +if (crtc) { + hdcp->cpu_transcoder = crtc->config->cpu_transcoder; + data->fw_tc =intel_get_mei_fw_tc (hdcp- >cpu_transcoder); + }
What is the 'else' action here, looks like there is no default value for fw_tc?
Quoted 46 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +6
-1+/* +* As per ME FW API expectation, for GEN 12+, fw_ddi is filled +* with INVALID PORT. +*/ + data->fw_ddi =intel_get_mei_fw_ddi_index (PORT_NONE ); + } - data->fw_ddi = intel_get_mei_fw_ddi_index(connector->encoder-Quoted 1 line
port);
drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0data->port_type = (u8 )HDCP_PORT_TYPE_INTEGRATED ; data->protocol = (u8 )shim->protocol;drivers/gpu/drm/i915/display/intel_hdcp.h +3
-0@@ -16,10 +16,13 @@ struct drm_i915_private; struct intel_connector; struct intel_hdcp_shim;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); +void intel_hdcp_transcoder_config (struct intel_connector *connector, +enum transcoder cpu_transcoder);int intel_hdcp_init (struct intel_connector *connector,const struct intel_hdcp_shim *hdcp_shim);int
intel_hdcp_enable(struct intel_connector *connector, u8 content_type); diff -- gita/drivers/gpu/drm/i915/display/intel_hdmi.cb/drivers/gpu/drm/i915/display/intel_hdmi.c
indexe02f0faecf02..6e9bb6bd1ee2100644drivers/gpu/drm/i915/display/intel_hdmi.c +3
-1@@ -2431,6 +2431,9 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, return -EINVAL ; } +intel_hdcp_transcoder_config (intel_hdmi->attached_connector, + pipe_config->cpu_transcoder); +return 0 ; } --
Quoted 1 line
2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v10 5/6] drm/i915/hdcp: update current transcoder into intel_hdcp
Quoted 105 lines · Tomas
Quoted 105 lines
On gen12+ platforms, HDCP HW is associated to the transcoder. Hence on every modeset update associated transcoder into the
intel_hdcpof the port.v2:
s/trans/cpu_transcoder [Jani]
v3:
comment is added forfw_ddiinit for gen12+ [Shashank] only hdcp capable transcoder is translated intofw_tc[Shashank]Signed-off-by Ramalingam C <[email protected]>Acked-by Jani Nikula <[email protected]>--- .../drm/i915/display/intel_display_types.h | 7 +++ drivers/gpu/drm/i915/display/intel_dp.c | 3 ++ drivers/gpu/drm/i915/display/intel_hdcp.c | 47 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_hdcp.h | 3 ++ drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++ 5 files changed, 62 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_display_types.h +7
-0@@ -388,6 +388,13 @@ struct intel_hdcp {wait_queue_head_t cp_irq_queue;atomic_t cp_irq_count;int cp_irq_count_cached; + +/* +* HDCP register access for gen12+ need the transcoder associated. +* Transcoder attached to the connector could be changed at modeset. +* Hence caching the transcoder here. +*/ +enum transcoder cpu_transcoder; };struct intel_connector {drivers/gpu/drm/i915/display/intel_dp.c +3
-0@@ -2248,6 +2248,9 @@ intel_dp_compute_config(struct intel_encoder *encoder,intel_psr_compute_config (intel_dp, pipe_config); +intel_hdcp_transcoder_config (intel_connector, + pipe_config->cpu_transcoder); +return 0 ; }drivers/gpu/drm/i915/display/intel_hdcp.c +33
-0@@ -1762,13 +1762,58 @@ enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port) } } +static inline +enum mei_fw_tc intel_get_mei_fw_tc (enum transcoder cpu_transcoder) { +switch (cpu_transcoder) { + case TRANSCODER_A ... TRANSCODER_D: +return (enum mei_fw_tc )(cpu_transcoder |0x10 ); +default :/* eDP, DSI TRANSCODERS are non HDCP capable */ +return MEI_INVALID_TRANSCODER ; + } +} + +void intel_hdcp_transcoder_config (struct intel_connector *connector, +enum transcoder cpu_transcoder) +{ +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; + +if (!hdcp->shim) +return ; + +if (INTEL_GEN (dev_priv) >=12 ) { +mutex_lock (&hdcp->mutex); + hdcp->cpu_transcoder = cpu_transcoder; + hdcp->port_data.fw_tc =intel_get_mei_fw_tc (cpu_transcoder); +mutex_unlock (&hdcp->mutex); + } +} +static inline int initialize_hdcp_port_data (struct intel_connector *connector,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; +struct intel_crtc *crtc; + +if (INTEL_GEN (dev_priv) <12 ) { + data->fw_ddi = +intel_get_mei_fw_ddi_index (connector->encoder- >port);
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port) · line 1809
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +6
-0+ }else { + crtc =to_intel_crtc (connector->base.state->crtc); +if (crtc) { + hdcp->cpu_transcoder = crtc->config->cpu_transcoder; + data->fw_tc =intel_get_mei_fw_tc (hdcp- >cpu_transcoder); + }What is the 'else' action here, looks like there is no default value for
fw_tc?
else block stands of gen12+ platforms. And with respect to fw_tc initialization, we are configuring it at every modeset through intel_hdcp_transcoder_config(), as transcoder might change at modeset. And in hdcp_init initializing is possible only if crtc is associated with connector already.
And it will be initilaized when mei_hdcp apis are called, as modeset is essential to invoke HDCP.
PORT is statically associated with connector, hence we are initializing here forever.
-Ram
Quoted 40 lines
Quoted 40 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +6
-1+/* +* As per ME FW API expectation, for GEN 12+, fw_ddi is filled +* with INVALID PORT. +*/ + data->fw_ddi =intel_get_mei_fw_ddi_index (PORT_NONE ); + } - data->fw_ddi = intel_get_mei_fw_ddi_index(connector->encoder-Quoted 1 line
port);
drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0data->port_type = (u8 )HDCP_PORT_TYPE_INTEGRATED ; data->protocol = (u8 )shim->protocol;drivers/gpu/drm/i915/display/intel_hdcp.h +3
-0@@ -16,10 +16,13 @@ struct drm_i915_private; struct intel_connector; struct intel_hdcp_shim;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); +void intel_hdcp_transcoder_config (struct intel_connector *connector, +enum transcoder cpu_transcoder);int intel_hdcp_init (struct intel_connector *connector,const struct intel_hdcp_shim *hdcp_shim);int
intel_hdcp_enable(struct intel_connector *connector, u8 content_type); diff -- gita/drivers/gpu/drm/i915/display/intel_hdmi.cb/drivers/gpu/drm/i915/display/intel_hdmi.c
indexe02f0faecf02..6e9bb6bd1ee2100644drivers/gpu/drm/i915/display/intel_hdmi.c +0
-0@@ -2431,6 +2431,9 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, return -EINVAL ; }
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_hdmi.c +3
-1+intel_hdcp_transcoder_config (intel_hdmi->attached_connector, + pipe_config->cpu_transcoder); +return 0 ; } --2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v10 5/6] drm/i915/hdcp: update current transcoder into intel_hdcp
Quoted 115 lines · Tomas
Quoted 20 lines
Quoted 20 lines
On gen12+ platforms, HDCP HW is associated to the transcoder. Hence on every modeset update associated transcoder into the
intel_hdcpof the port.v2:
s/trans/cpu_transcoder [Jani]
v3:
comment is added forfw_ddiinit for gen12+ [Shashank] only hdcp capable transcoder is translated intofw_tc[Shashank]Signed-off-by Ramalingam C <[email protected]>Acked-by Jani Nikula <[email protected]>--- .../drm/i915/display/intel_display_types.h | 7 +++ drivers/gpu/drm/i915/display/intel_dp.c | 3 ++ drivers/gpu/drm/i915/display/intel_hdcp.c | 47 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_hdcp.h | 3 ++ drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++ 5 files changed, 62 insertions(+), 1 deletion(-)Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display_types.h struct intel_hdcp { · line 394
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display_types.h +4
-0@@ -388,6 +388,13 @@ struct intel_hdcp {wait_queue_head_t cp_irq_queue;atomic_t cp_irq_count;int cp_irq_count_cached; + +/* +* HDCP register access for gen12+ need the transcoder associated. +* Transcoder attached to the connector could be changed at modeset.
Quoted 32 lines
Quoted 32 lines
drivers/gpu/drm/i915/display/intel_display_types.h +3
-0+* Hence caching the transcoder here. +*/ +enum transcoder cpu_transcoder; };struct intel_connector {drivers/gpu/drm/i915/display/intel_dp.c +3
-0@@ -2248,6 +2248,9 @@ intel_dp_compute_config(struct intel_encoder *encoder,intel_psr_compute_config (intel_dp, pipe_config); +intel_hdcp_transcoder_config (intel_connector, + pipe_config->cpu_transcoder); +return 0 ; }drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0@@ -1762,13 +1762,58 @@ enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port) } }Quoted 2 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port) · line 1766
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +2
-0+static inline +enum mei_fw_tc intel_get_mei_fw_tc (enum transcoder cpu_transcoder){
Quoted 18 lines
Quoted 18 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +18
-0+switch (cpu_transcoder) { + case TRANSCODER_A ... TRANSCODER_D: +return (enum mei_fw_tc )(cpu_transcoder |0x10 ); +default :/* eDP, DSI TRANSCODERS are non HDCP capable */ +return MEI_INVALID_TRANSCODER ; + } +} + +void intel_hdcp_transcoder_config (struct intel_connector *connector, +enum transcoder cpu_transcoder) { +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; + +if (!hdcp->shim) +return ; + +if (INTEL_GEN (dev_priv) >=12 ) { +mutex_lock (&hdcp->mutex);Quoted 8 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port)
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +6
-0+ hdcp->cpu_transcoder = cpu_transcoder; + hdcp->port_data.fw_tc =intel_get_mei_fw_tc (cpu_transcoder); +mutex_unlock (&hdcp->mutex); + } +} + static inline int initialize_hdcp_port_data(struct intel_connector*connector,
Quoted 1 line
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi · line 1794
Quoted 1 line
drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0const struct intel_hdcp_shim*shim) {
Quoted 14 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port)
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +10
-0+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; +struct intel_crtc *crtc; + +if (INTEL_GEN (dev_priv) <12 ) { + data->fw_ddi = +intel_get_mei_fw_ddi_index (connector->encoder- >port); + }else { + crtc =to_intel_crtc (connector->base.state->crtc); +if (crtc) { + hdcp->cpu_transcoder = crtc->config-
cpu_transcoder;
Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi · line 1810
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +2
-0+ data->fw_tc =intel_get_mei_fw_tc (hdcp- >cpu_transcoder); + }What is the 'else' action here, looks like there is no default value for
fw_tc?else block stands of gen12+ platforms.
I mean when if (crctc) is false
And with respect to fw_tc
Quoted 4 lines
initialization, we are configuring it at every modeset through
intel_hdcp_transcoder_config(), as transcoder might change at modeset. And inhdcp_initinitializing is possible only if crtc is associated with connector already.
So this is a bug if crtc is not NULL here? Should we set issue an error message?
Quoted 3 lines
And it will be initilaized when
mei_hdcpapis are called, as modeset is essential to invoke HDCP.
It is not clear form the context, the else statement for crtc requires at minimum a comment.
Quoted 56 lines
PORT is statically associated with connector, hence we are initializing here forever.
-Ram
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi · line 1812
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +2
-0+/* +* As per ME FW API expectation, for GEN 12+, fw_ddi is filled
Quoted 47 lines
Quoted 46 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +4
-1+* with INVALID PORT. +*/ + data->fw_ddi =intel_get_mei_fw_ddi_index (PORT_NONE ); + } - data->fw_ddi = intel_get_mei_fw_ddi_index(connector->encoder-Quoted 1 line
port);
drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0data->port_type = (u8 )HDCP_PORT_TYPE_INTEGRATED ; data->protocol = (u8 )shim->protocol;drivers/gpu/drm/i915/display/intel_hdcp.h +3
-0@@ -16,10 +16,13 @@ struct drm_i915_private; struct intel_connector;struct intel_hdcp_shim ;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); +void intel_hdcp_transcoder_config (struct intel_connector *connector, +enum transcoder cpu_transcoder);int intel_hdcp_init (struct intel_connector *connector,const struct intel_hdcp_shim *hdcp_shim);int
intel_hdcp_enable(struct intel_connector *connector, u8 content_type); diff -- gita/drivers/gpu/drm/i915/display/intel_hdmi.cb/drivers/gpu/drm/i915/display/intel_hdmi.cindexe02f0faecf02..6e9bb6bd1ee2100644drivers/gpu/drm/i915/display/intel_hdmi.c +3
-1@@ -2431,6 +2431,9 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, return -EINVAL ; } +intel_hdcp_transcoder_config (intel_hdmi->attached_connector, + pipe_config->cpu_transcoder); +return 0 ; } --2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v10 5/6] drm/i915/hdcp: update current transcoder into intel_hdcp
Quoted 115 lines · Tomas
Quoted 115 lines · Tomas
Quoted 20 lines
Quoted 20 lines
On gen12+ platforms, HDCP HW is associated to the transcoder. Hence on every modeset update associated transcoder into the
intel_hdcpof the port.v2:
s/trans/cpu_transcoder [Jani]
v3:
comment is added forfw_ddiinit for gen12+ [Shashank] only hdcp capable transcoder is translated intofw_tc[Shashank]Signed-off-by Ramalingam C <[email protected]>Acked-by Jani Nikula <[email protected]>--- .../drm/i915/display/intel_display_types.h | 7 +++ drivers/gpu/drm/i915/display/intel_dp.c | 3 ++ drivers/gpu/drm/i915/display/intel_hdcp.c | 47 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_hdcp.h | 3 ++ drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++ 5 files changed, 62 insertions(+), 1 deletion(-)Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display_types.h struct intel_hdcp { · line 394
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display_types.h +4
-0@@ -388,6 +388,13 @@ struct intel_hdcp {wait_queue_head_t cp_irq_queue;atomic_t cp_irq_count;int cp_irq_count_cached; + +/* +* HDCP register access for gen12+ need the transcoder associated. +* Transcoder attached to the connector could be changed at modeset.
Quoted 32 lines
Quoted 32 lines
drivers/gpu/drm/i915/display/intel_display_types.h +3
-0+* Hence caching the transcoder here. +*/ +enum transcoder cpu_transcoder; };struct intel_connector {drivers/gpu/drm/i915/display/intel_dp.c +3
-0@@ -2248,6 +2248,9 @@ intel_dp_compute_config(struct intel_encoder *encoder,intel_psr_compute_config (intel_dp, pipe_config); +intel_hdcp_transcoder_config (intel_connector, + pipe_config->cpu_transcoder); +return 0 ; }drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0@@ -1762,13 +1762,58 @@ enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port) } }Quoted 2 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port) · line 1766
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +2
-0+static inline +enum mei_fw_tc intel_get_mei_fw_tc (enum transcoder cpu_transcoder){
Quoted 18 lines
Quoted 18 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +18
-0+switch (cpu_transcoder) { + case TRANSCODER_A ... TRANSCODER_D: +return (enum mei_fw_tc )(cpu_transcoder |0x10 ); +default :/* eDP, DSI TRANSCODERS are non HDCP capable */ +return MEI_INVALID_TRANSCODER ; + } +} + +void intel_hdcp_transcoder_config (struct intel_connector *connector, +enum transcoder cpu_transcoder) { +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; + +if (!hdcp->shim) +return ; + +if (INTEL_GEN (dev_priv) >=12 ) { +mutex_lock (&hdcp->mutex);Quoted 8 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port)
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +6
-0+ hdcp->cpu_transcoder = cpu_transcoder; + hdcp->port_data.fw_tc =intel_get_mei_fw_tc (cpu_transcoder); +mutex_unlock (&hdcp->mutex); + } +} + static inline int initialize_hdcp_port_data(struct intel_connector*connector,
Quoted 1 line
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi · line 1794
Quoted 1 line
drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0const struct intel_hdcp_shim*shim) {
Quoted 14 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port)
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +10
-0+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; +struct intel_crtc *crtc; + +if (INTEL_GEN (dev_priv) <12 ) { + data->fw_ddi = +intel_get_mei_fw_ddi_index (connector->encoder- >port); + }else { + crtc =to_intel_crtc (connector->base.state->crtc); +if (crtc) { + hdcp->cpu_transcoder = crtc->config-
cpu_transcoder;
Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi · line 1810
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +2
-0+ data->fw_tc =intel_get_mei_fw_tc (hdcp- >cpu_transcoder); + }What is the 'else' action here, looks like there is no default value for
fw_tc?else block stands of gen12+ platforms.
I mean when if (crctc) is false
And with respect to
fw_tc
relooking at it, AFAIK there is no scenario when crtc will be associated at this point in time(connector_init) So I am planning to initialize the fw_tc to invalid index here. And when crtc and transcoder are linked to connector at modeset fw_tc will be initialized for gen12+ platform.
Thanks for the discussion here. Adding required docs as comment too
-Ram
Quoted 5 lines
Quoted 4 lines
initialization, we are configuring it at every modeset through
intel_hdcp_transcoder_config(), as transcoder might change at modeset. And inhdcp_initinitializing is possible only if crtc is associated with connector already.
Quoted 62 lines
So this is a bug if crtc is not NULL here? Should we set issue an error message?
Quoted 3 lines
And it will be initilaized when
mei_hdcpapis are called, as modeset is essential to invoke HDCP.It is not clear form the context, the else statement for crtc requires at minimum a comment.
Quoted 56 lines
PORT is statically associated with connector, hence we are initializing here forever.
-Ram
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi · line 1812
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +2
-0+/* +* As per ME FW API expectation, for GEN 12+, fw_ddi is filled
Quoted 47 lines
Quoted 46 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +4
-1+* with INVALID PORT. +*/ + data->fw_ddi =intel_get_mei_fw_ddi_index (PORT_NONE ); + } - data->fw_ddi = intel_get_mei_fw_ddi_index(connector->encoder-Quoted 1 line
port);
drivers/gpu/drm/i915/display/intel_hdcp.c +0
-0data->port_type = (u8 )HDCP_PORT_TYPE_INTEGRATED ; data->protocol = (u8 )shim->protocol;drivers/gpu/drm/i915/display/intel_hdcp.h +3
-0@@ -16,10 +16,13 @@ struct drm_i915_private; struct intel_connector;struct intel_hdcp_shim ;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); +void intel_hdcp_transcoder_config (struct intel_connector *connector, +enum transcoder cpu_transcoder);int intel_hdcp_init (struct intel_connector *connector,const struct intel_hdcp_shim *hdcp_shim);int
intel_hdcp_enable(struct intel_connector *connector, u8 content_type); diff -- gita/drivers/gpu/drm/i915/display/intel_hdmi.cb/drivers/gpu/drm/i915/display/intel_hdmi.cindexe02f0faecf02..6e9bb6bd1ee2100644drivers/gpu/drm/i915/display/intel_hdmi.c +3
-1@@ -2431,6 +2431,9 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, return -EINVAL ; } +intel_hdcp_transcoder_config (intel_hdmi->attached_connector, + pipe_config->cpu_transcoder); +return 0 ; } --2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 6/6 drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+
In reply to Ramalingam CQuoted 1 line
From Gen12 onwards, HDCP HW block is implemented within transcoders.
Till Gen11 HDCP HW block was part of DDI.
Hence required changes in HW programming is handled here.
As ME FW needs the transcoder detail on which HDCP is enabled on Gen12+ platform, we are populating the detail in hdcp_port_data.
v2:
_MMIO_TRANS is used [Lucas and Daniel]
platform check is moved into the caller [Lucas]
v3:
platform check is moved into a macro [Shashank]
v4:
Few optimizations in the coding [Shashank]
v5:
Fixed alignment in macro definition in i915_reg.h [Shashank] unused variables "reg" is removed.
v6:
Configuring the transcoder at compute_config. transcoder is used instead of pipe in macros. Rebased.
v7:
transcoder is cached at intel_hdcp
hdcp_port_data is configured with transcoder index asper ME FW.
v8:
s/trans/cpu_transcoder
s/tc/cpu_transcoder
v9:
rep_ctl is prepared for TCD too.
return moved into deault of rep_ctl prepare function [Shashank]
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 152 ++++++++++++++-------- drivers/gpu/drm/i915/display/intel_hdmi.c | 10 +- drivers/gpu/drm/i915/i915_reg.h | 124 ++++++++++++++++-- 3 files changed, 221 insertions(+), 65 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +99 -53
@@ -18,6 +18,7 @@#include "intel_display_types.h" #include "intel_hdcp.h" #include "intel_sideband.h" +#include "intel_connector.h" #define KEY_LOAD_TRIES 5#define ENCRYPT_STATUS_CHANGE_TIMEOUT_MS 50
@@ -105,24 +106,20 @@ bool intel_hdcp2_capable(struct intel_connector *connector)return capable; } -static inline bool intel_hdcp_in_use (struct intel_connector *connector) +static inline +bool intel_hdcp_in_use (struct drm_i915_private *dev_priv, +enum transcoder cpu_transcoder,enum port port) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); -enum port port = connector->encoder->port; -u32 reg; - - reg =I915_READ (PORT_HDCP_STATUS (port)); -return reg &HDCP_STATUS_ENC ; +return I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, port)) & +HDCP_STATUS_ENC ; } -static inline bool intel_hdcp2_in_use (struct intel_connector *connector) +static inline +bool intel_hdcp2_in_use (struct drm_i915_private *dev_priv, +enum transcoder cpu_transcoder,enum port port) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); -enum port port = connector->encoder->port; -u32 reg; - - reg =I915_READ (HDCP2_STATUS_DDI (port)); -return reg &LINK_ENCRYPTION_STATUS ; +return I915_READ (HDCP2_STATUS (dev_priv, cpu_transcoder, port)) & +LINK_ENCRYPTION_STATUS ; } static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,
@@ -253,9 +250,29 @@ static int intel_write_sha_text(struct drm_i915_private *dev_priv, u32 sha_text) }static -u32 intel_hdcp_get_repeater_ctl (struct intel_digital_port *intel_dig_port) +u32 intel_hdcp_get_repeater_ctl (struct drm_i915_private *dev_priv, +enum transcoder cpu_transcoder,enum port port) { -enum port port = intel_dig_port->base.port; +if (INTEL_GEN (dev_priv) >=12 ) { +switch (cpu_transcoder) { +case TRANSCODER_A : +return HDCP_TRANSA_REP_PRESENT | +HDCP_TRANSA_SHA1_M0 ; +case TRANSCODER_B : +return HDCP_TRANSB_REP_PRESENT | +HDCP_TRANSB_SHA1_M0 ; +case TRANSCODER_C : +return HDCP_TRANSC_REP_PRESENT | +HDCP_TRANSC_SHA1_M0 ; +case TRANSCODER_D : +return HDCP_TRANSD_REP_PRESENT | +HDCP_TRANSD_SHA1_M0 ; +default : +DRM_ERROR ("Unknown transcoder %d\n" , cpu_transcoder); +return -EINVAL ; + } + } +switch (port) {case PORT_A :return HDCP_DDIA_REP_PRESENT |HDCP_DDIA_SHA1_M0 ;
@@ -268,18 +285,20 @@ u32 intel_hdcp_get_repeater_ctl(struct intel_digital_port *intel_dig_port)case PORT_E :return HDCP_DDIE_REP_PRESENT |HDCP_DDIE_SHA1_M0 ;default : -break ; +DRM_ERROR ("Unknown port %d\n" , port); +return -EINVAL ; } -DRM_ERROR ("Unknown port %d\n" , port); -return -EINVAL ; }static -int intel_hdcp_validate_v_prime (struct intel_digital_port *intel_dig_port, +int intel_hdcp_validate_v_prime (struct intel_connector *connector,const struct intel_hdcp_shim *shim,u8 *ksv_fifo,u8 num_downstream,u8 *bstatus) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector);struct drm_i915_private *dev_priv; +enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder; +enum port port = intel_dig_port->base.port;u32 vprime, sha_text, sha_leftovers, rep_ctl;int ret, i, j, sha_idx;
@@ -306,7 +325,7 @@ int intel_hdcp_validate_v_prime(struct intel_digital_port *intel_dig_port, sha_idx =0 ; sha_text =0 ; sha_leftovers =0 ; - rep_ctl =intel_hdcp_get_repeater_ctl (intel_dig_port); + rep_ctl =intel_hdcp_get_repeater_ctl (dev_priv, cpu_transcoder, port);I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_32 );for (i =0 ; i < num_downstream; i++) {unsigned int sha_empty;
@@ -548,7 +567,7 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)* V prime atleast twice. */ for (i =0 ; i < tries; i++) { - ret =intel_hdcp_validate_v_prime (intel_dig_port, shim, + ret =intel_hdcp_validate_v_prime (connector, shim, ksv_fifo, num_downstream, bstatus);if (!ret)
@@ -576,6 +595,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)struct drm_device *dev = connector->base.dev;const struct intel_hdcp_shim *shim = hdcp->shim;struct drm_i915_private *dev_priv; +enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder;enum port port;unsigned long r0_prime_gen_start;int ret, i, tries =2 ;
@@ -615,18 +635,21 @@ static int intel_hdcp_auth(struct intel_connector *connector)/* Initialize An with 2 random values and acquire it */ for (i =0 ; i <2 ; i++) -I915_WRITE (PORT_HDCP_ANINIT (port),get_random_u32 ()); -I915_WRITE (PORT_HDCP_CONF (port),HDCP_CONF_CAPTURE_AN ); +I915_WRITE (HDCP_ANINIT (dev_priv, cpu_transcoder, port), +get_random_u32 ()); +I915_WRITE (HDCP_CONF (dev_priv, cpu_transcoder, port), +HDCP_CONF_CAPTURE_AN );/* Wait for An to be acquired */ -if (intel_de_wait_for_set (dev_priv,PORT_HDCP_STATUS (port), +if (intel_de_wait_for_set (dev_priv, +HDCP_STATUS (dev_priv, cpu_transcoder, port),HDCP_STATUS_AN_READY ,1 )) {DRM_ERROR ("Timed out waiting for An\n" );return -ETIMEDOUT ; } - an.reg[0 ] =I915_READ (PORT_HDCP_ANLO (port)); - an.reg[1 ] =I915_READ (PORT_HDCP_ANHI (port)); + an.reg[0 ] =I915_READ (HDCP_ANLO (dev_priv, cpu_transcoder, port)); + an.reg[1 ] =I915_READ (HDCP_ANHI (dev_priv, cpu_transcoder, port)); ret = shim->write_an_aksv (intel_dig_port, an.shim);if (ret)return ret;
@@ -644,24 +667,26 @@ static int intel_hdcp_auth(struct intel_connector *connector)return -EPERM ; } -I915_WRITE (PORT_HDCP_BKSVLO (port), bksv.reg[0 ]); -I915_WRITE (PORT_HDCP_BKSVHI (port), bksv.reg[1 ]); +I915_WRITE (HDCP_BKSVLO (dev_priv, cpu_transcoder, port), bksv.reg[0 ]); +I915_WRITE (HDCP_BKSVHI (dev_priv, cpu_transcoder, port), bksv.reg[1 ]); ret = shim->repeater_present (intel_dig_port, &repeater_present);if (ret)return ret;if (repeater_present)I915_WRITE (HDCP_REP_CTL , -intel_hdcp_get_repeater_ctl (intel_dig_port)); +intel_hdcp_get_repeater_ctl (dev_priv, cpu_transcoder, + port)); ret = shim->toggle_signalling (intel_dig_port, true);if (ret)return ret; -I915_WRITE (PORT_HDCP_CONF (port),HDCP_CONF_AUTH_AND_ENC ); +I915_WRITE (HDCP_CONF (dev_priv, cpu_transcoder, port), +HDCP_CONF_AUTH_AND_ENC );/* Wait for R0 ready */ -if (wait_for (I915_READ (PORT_HDCP_STATUS (port)) & +if (wait_for (I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, port)) & (HDCP_STATUS_R0_READY |HDCP_STATUS_ENC ),1 )) {DRM_ERROR ("Timed out waiting for R0 ready\n" );return -ETIMEDOUT ;
@@ -689,22 +714,25 @@ static int intel_hdcp_auth(struct intel_connector *connector) ret = shim->read_ri_prime (intel_dig_port, ri.shim);if (ret)return ret; -I915_WRITE (PORT_HDCP_RPRIME (port), ri.reg); +I915_WRITE (HDCP_RPRIME (dev_priv, cpu_transcoder, port), ri.reg);/* Wait for Ri prime match */ -if (!wait_for (I915_READ (PORT_HDCP_STATUS (port)) & +if (!wait_for (I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, + port)) & (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 ))break ; }if (i == tries) {DRM_DEBUG_KMS ("Timed out waiting for Ri prime match (%x)\n" , -I915_READ (PORT_HDCP_STATUS (port))); +I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, + port)));return -ETIMEDOUT ; }/* Wait for encryption confirmation */ -if (intel_de_wait_for_set (dev_priv,PORT_HDCP_STATUS (port), +if (intel_de_wait_for_set (dev_priv, +HDCP_STATUS (dev_priv, cpu_transcoder, port),HDCP_STATUS_ENC ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) {DRM_ERROR ("Timed out waiting for encryption\n" );
@@ -729,15 +757,17 @@ static int _intel_hdcp_disable(struct intel_connector *connector)struct drm_i915_private *dev_priv = connector->base.dev->dev_private;struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector);enum port port = intel_dig_port->base.port; +enum transcoder cpu_transcoder = hdcp->cpu_transcoder;int ret;DRM_DEBUG_KMS ("[%s:%d] HDCP is being disabled...\n" , connector->base.name, connector->base.base.id); hdcp->hdcp_encrypted = false; -I915_WRITE (PORT_HDCP_CONF (port),0 ); -if (intel_de_wait_for_clear (dev_priv,PORT_HDCP_STATUS (port), ~0 , -ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) { +I915_WRITE (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 )) {DRM_ERROR ("Failed to disable HDCP, timeout clearing status\n" );return -ETIMEDOUT ; }
@@ -808,9 +838,11 @@ static int intel_hdcp_check_link(struct intel_connector *connector)struct drm_i915_private *dev_priv = connector->base.dev->dev_private;struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector);enum port port = intel_dig_port->base.port; +enum transcoder cpu_transcoder;int ret =0 ;mutex_lock (&hdcp->mutex); + cpu_transcoder = hdcp->cpu_transcoder;/* Check_link valid only when HDCP1.4 is enabled */ if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||
@@ -819,10 +851,11 @@ static int intel_hdcp_check_link(struct intel_connector *connector) goto out; } -if (WARN_ON (!intel_hdcp_in_use (connector))) { +if (WARN_ON (!intel_hdcp_in_use (dev_priv, cpu_transcoder, port))) {DRM_ERROR ("%s:%d HDCP link stopped encryption,%x\n" , connector->base.name, connector->base.base.id, -I915_READ (PORT_HDCP_STATUS (port))); +I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, + port))); ret = -ENXIO ; hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;schedule_work (&hdcp->prop_work);
@@ -1493,10 +1526,11 @@ static int hdcp2_enable_encryption(struct intel_connector *connector)struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;enum port port = connector->encoder->port; +enum transcoder cpu_transcoder = hdcp->cpu_transcoder;int ret; -WARN_ON (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS ); - +WARN_ON (I915_READ (HDCP2_STATUS (dev_priv, cpu_transcoder, port)) & +LINK_ENCRYPTION_STATUS );if (hdcp->shim->toggle_signalling) { ret = hdcp->shim->toggle_signalling (intel_dig_port, true);if (ret) {
@@ -1506,14 +1540,18 @@ static int hdcp2_enable_encryption(struct intel_connector *connector) } } -if (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_AUTH_STATUS ) { +if (I915_READ (HDCP2_STATUS (dev_priv, cpu_transcoder, port)) & +LINK_AUTH_STATUS ) {/* Link is Authenticated. Now set for Encryption */ -I915_WRITE (HDCP2_CTL_DDI (port), -I915_READ (HDCP2_CTL_DDI (port)) | +I915_WRITE (HDCP2_CTL (dev_priv, cpu_transcoder, port), +I915_READ (HDCP2_CTL (dev_priv, cpu_transcoder, + port)) |CTL_LINK_ENCRYPTION_REQ ); } - ret =intel_de_wait_for_set (dev_priv,HDCP2_STATUS_DDI (port), + ret =intel_de_wait_for_set (dev_priv, +HDCP2_STATUS (dev_priv, cpu_transcoder, + port),LINK_ENCRYPTION_STATUS ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS );
@@ -1526,14 +1564,19 @@ static int hdcp2_disable_encryption(struct intel_connector *connector)struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;enum port port = connector->encoder->port; +enum transcoder cpu_transcoder = hdcp->cpu_transcoder;int ret; -WARN_ON (!(I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS )); +WARN_ON (!(I915_READ (HDCP2_STATUS (dev_priv, cpu_transcoder, port)) & +LINK_ENCRYPTION_STATUS )); -I915_WRITE (HDCP2_CTL_DDI (port), -I915_READ (HDCP2_CTL_DDI (port)) & ~CTL_LINK_ENCRYPTION_REQ ); +I915_WRITE (HDCP2_CTL (dev_priv, cpu_transcoder, port), +I915_READ (HDCP2_CTL (dev_priv, cpu_transcoder, port)) & + ~CTL_LINK_ENCRYPTION_REQ ); - ret =intel_de_wait_for_clear (dev_priv,HDCP2_STATUS_DDI (port), + ret =intel_de_wait_for_clear (dev_priv, +HDCP2_STATUS (dev_priv, cpu_transcoder, + port),LINK_ENCRYPTION_STATUS ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS );if (ret == -ETIMEDOUT )
@@ -1632,9 +1675,11 @@ static int intel_hdcp2_check_link(struct intel_connector *connector)struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;enum port port = connector->encoder->port; +enum transcoder cpu_transcoder;int ret =0 ;mutex_lock (&hdcp->mutex); + cpu_transcoder = hdcp->cpu_transcoder;/* hdcp2_check_link is expected only when HDCP2.2 is Enabled */ if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||
@@ -1643,9 +1688,10 @@ static int intel_hdcp2_check_link(struct intel_connector *connector) goto out; } -if (WARN_ON (!intel_hdcp2_in_use (connector))) { +if (WARN_ON (!intel_hdcp2_in_use (dev_priv, cpu_transcoder, port))) {DRM_ERROR ("HDCP2.2 link stopped the encryption, %x\n" , -I915_READ (HDCP2_STATUS_DDI (port))); +I915_READ (HDCP2_STATUS (dev_priv, cpu_transcoder, + port))); ret = -ENXIO ; hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;schedule_work (&hdcp->prop_work);
drivers/gpu/drm/i915/display/intel_hdmi.c +7 -3
@@ -1491,7 +1491,10 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) {struct drm_i915_private *dev_priv = intel_dig_port->base.base.dev->dev_private; +struct intel_connector *connector = + intel_dig_port->hdmi.attached_connector;enum port port = intel_dig_port->base.port; +enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder;int ret;union {u32 reg;
@@ -1502,13 +1505,14 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)if (ret)return false; -I915_WRITE (PORT_HDCP_RPRIME (port), ri.reg); +I915_WRITE (HDCP_RPRIME (dev_priv, cpu_transcoder, port), ri.reg);/* Wait for Ri prime match */ -if (wait_for (I915_READ (PORT_HDCP_STATUS (port)) & +if (wait_for (I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, port)) & (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) {DRM_ERROR ("Ri' mismatch detected, link check failed (%x)\n" , -I915_READ (PORT_HDCP_STATUS (port))); +I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, + port)));return false; }return true;
drivers/gpu/drm/i915/i915_reg.h +115 -9
165 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ (rev8)
In reply to Ramalingam C== Series Details ==
== Series Details ==
Series: drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ (rev8)
URL : https://patchwork.freedesktop.org/series/63432/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6791 -> Patchwork_14198
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/
Known issues
------------
Here are the changes found in Patchwork_14198 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [PASS][1] -> [INCOMPLETE][2] ([fdo#107718])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/fi-blb-e6850/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/fi-blb-e6850/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [PASS][3] -> [FAIL][4] ([fdo#103167])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/fi-icl-u2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live_reset:
- {fi-icl-dsi}: [INCOMPLETE][5] ([fdo#107713]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/fi-icl-dsi/igt@i915_selftest@live_reset.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/fi-icl-dsi/igt@i915_selftest@live_reset.html
#### Warnings ####
* igt@i915_module_load@reload:
- fi-icl-u2: [DMESG-WARN][7] ([fdo#110595]) -> [DMESG-WARN][8] ([fdo#110595] / [fdo#111214])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/fi-icl-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/fi-icl-u2/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-icl-u2: [INCOMPLETE][9] ([fdo#107713] / [fdo#108840]) -> [DMESG-WARN][10] ([fdo#110595])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/fi-icl-u2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/fi-icl-u2/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#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#110595]: https://bugs.freedesktop.org/show_bug.cgi?id=110595
[fdo#111214]: https://bugs.freedesktop.org/show_bug.cgi?id=111214
Participating hosts (52 -> 44)
------------------------------
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6791 -> Patchwork_14198
CI-20190529: 20190529
CI_DRM_6791: 911cf01f441a754e8ee511d4968f711c54e20ed8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5150: a4e8217bcdfef9bb523f26a9084bbf615a6e8abb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14198: 0101914752f70aa1cf5bd030103f38bdfcfd6a91 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
0101914752f7 drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+ 06d9c7f7117c drm/i915/hdcp: update current transcoder into intel_hdcp 41afdc6b33b2 misc/mei/hdcp: Fill transcoder index in port info 20b0b00b2eea drm: Extend I915 mei interface for transcoder info 2a2e8c70055d drm: Move port definition back to i915 header 78ef4b4ab207 drm/i915: mei_hdcp: I915 sends ddi index as per ME FW
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines
Enabling the HDCP1.4 and 2.2 on TGL by supporting the HW block movement from DDI into transcoder.
In some files needs to bump the copyright to 2019.
Quoted 30 lines
v10:
Review comments from shashank addressedRamalingam C (6):
drm/i915:mei_hdcp: I915 sends ddi index as per ME FW
drm: Move port definition back to i915 header
drm: Extend I915 mei interface for transcoder info misc/mei/hdcp: Fill transcoder index in port info drm/i915/hdcp: update current transcoder intointel_hdcpdrm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+drivers/gpu/drm/i915/display/intel_bios.h | 1 + drivers/gpu/drm/i915/display/intel_display.h | 18 ++ .../drm/i915/display/intel_display_types.h | 7 + drivers/gpu/drm/i915/display/intel_dp.c | 3 + drivers/gpu/drm/i915/display/intel_dp.h | 1 + drivers/gpu/drm/i915/display/intel_hdcp.c | 212 +++++++++++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 4 + drivers/gpu/drm/i915/display/intel_hdmi.c | 13 +- drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + drivers/gpu/drm/i915/display/intel_hotplug.h | 1 + drivers/gpu/drm/i915/display/intel_sdvo.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 124 +++++++++- drivers/misc/mei/hdcp/mei_hdcp.c | 45 ++-- drivers/misc/mei/hdcp/mei_hdcp.h | 16 +- include/drm/i915_drm.h | 18 -- include/drm/i915_mei_hdcp_interface.h | 29 ++- 16 files changed, 372 insertions(+), 122 deletions(-)
Quoted 2 lines
--
2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 5 lines · Tomas
Quoted 3 lines
Enabling the HDCP1.4 and 2.2 on TGL by supporting the HW block movement from DDI into transcoder.
In some files needs to bump the copyright to 2019.
Tomas,
I am not aware when a copyright year needs to be bumped, as copyright year for many I915 files are not latest.
Any guidelines here would help me to understand.
Thanks,
-Ram.
Quoted 31 lines
Quoted 31 lines
v10:
Review comments from shashank addressedRamalingam C (6):
drm/i915:mei_hdcp: I915 sends ddi index as per ME FW
drm: Move port definition back to i915 header
drm: Extend I915 mei interface for transcoder info misc/mei/hdcp: Fill transcoder index in port info drm/i915/hdcp: update current transcoder intointel_hdcpdrm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+drivers/gpu/drm/i915/display/intel_bios.h | 1 + drivers/gpu/drm/i915/display/intel_display.h | 18 ++ .../drm/i915/display/intel_display_types.h | 7 + drivers/gpu/drm/i915/display/intel_dp.c | 3 + drivers/gpu/drm/i915/display/intel_dp.h | 1 + drivers/gpu/drm/i915/display/intel_hdcp.c | 212 +++++++++++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 4 + drivers/gpu/drm/i915/display/intel_hdmi.c | 13 +- drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + drivers/gpu/drm/i915/display/intel_hotplug.h | 1 + drivers/gpu/drm/i915/display/intel_sdvo.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 124 +++++++++- drivers/misc/mei/hdcp/mei_hdcp.c | 45 ++-- drivers/misc/mei/hdcp/mei_hdcp.h | 16 +- include/drm/i915_drm.h | 18 -- include/drm/i915_mei_hdcp_interface.h | 29 ++- 16 files changed, 372 insertions(+), 122 deletions(-)
Quoted 3 lines
Quoted 2 lines
--
2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Only files are that are modified in this year should be updated. For example.include/drm/i915_mei_hdcp_interface.h
- * Copyright © 2017-2018 Intel Corporation
+ * Copyright © 2017-2019 Intel Corporation
Quoted 18 lines
-----Original Message-----
From: C, Ramalingam
Sent: Tuesday, August 27, 2019 16:23
To: Winkler, Tomas <[email protected]>
Cc: intel-gfx <[email protected]>; dri-devel <dri- [email protected]>; Sharma, Shashank <[email protected]>; Daniel Vetter <[email protected]>; Nikula, Jani <[email protected]>
Subject: Re: [PATCH v10 0/6] drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+Quoted 5 lines · Tomas
Quoted 3 lines
Enabling the HDCP1.4 and 2.2 on TGL by supporting the HW block movement from DDI into transcoder.
In some files needs to bump the copyright to 2019.
Tomas,
Quoted 41 lines
I am not aware when a copyright year needs to be bumped, as copyright year for many I915 files are not latest.
Any guidelines here would help me to understand.
Thanks,
-Ram.Quoted 34 lines
Quoted 33 lines
v10:
Review comments from shashank addressedRamalingam C (6):
drm/i915:mei_hdcp: I915 sends ddi index as per ME FW
drm: Move port definition back to i915 header
drm: Extend I915 mei interface for transcoder info misc/mei/hdcp: Fill transcoder index in port info drm/i915/hdcp: update current transcoder intointel_hdcpdrm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+drivers/gpu/drm/i915/display/intel_bios.h | 1 + drivers/gpu/drm/i915/display/intel_display.h | 18 ++ .../drm/i915/display/intel_display_types.h | 7 + drivers/gpu/drm/i915/display/intel_dp.c | 3 + drivers/gpu/drm/i915/display/intel_dp.h | 1 + drivers/gpu/drm/i915/display/intel_hdcp.c | 212 +++++++++++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 4 + drivers/gpu/drm/i915/display/intel_hdmi.c | 13 +- drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + drivers/gpu/drm/i915/display/intel_hotplug.h | 1 + drivers/gpu/drm/i915/display/intel_sdvo.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 124 +++++++++- drivers/misc/mei/hdcp/mei_hdcp.c | 45 ++-- drivers/misc/mei/hdcp/mei_hdcp.h | 16 +- include/drm/i915_drm.h | 18 -- include/drm/i915_mei_hdcp_interface.h | 29 ++- 16 files changed, 372 insertions(+), 122 deletions(-)--
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ (rev8)
In reply to Ramalingam C== Series Details ==
== Series Details ==
Series: drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ (rev8)
URL : https://patchwork.freedesktop.org/series/63432/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6791_full -> Patchwork_14198_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/
Known issues
------------
Here are the changes found in Patchwork_14198_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#110841])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb5/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb4/igt@[email protected]
* igt@gem_exec_parallel@rcs0-contexts:
- shard-hsw: [PASS][3] -> [FAIL][4] ([fdo#111469])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-hsw8/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-hsw6/igt@[email protected]
* igt@gem_exec_schedule@preempt-contexts-bsd2:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276]) +11 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb7/igt@[email protected]
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#111325]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb7/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb2/igt@[email protected]
* igt@gem_softpin@noreloc-s3:
- shard-skl: [PASS][9] -> [INCOMPLETE][10] ([fdo#104108])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-skl6/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-skl9/igt@[email protected]
* igt@i915_pm_rpm@modeset-lpsp-stress:
- shard-iclb: [PASS][11] -> [INCOMPLETE][12] ([fdo#107713] / [fdo#108840])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb4/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb2/igt@[email protected]
* igt@i915_suspend@sysfs-reader:
- shard-apl: [PASS][13] -> [DMESG-WARN][14] ([fdo#108566]) +4 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-apl5/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-apl6/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-128x42-offscreen:
- shard-apl: [PASS][15] -> [INCOMPLETE][16] ([fdo#103927])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-apl1/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-apl5/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
- shard-glk: [PASS][17] -> [FAIL][18] ([fdo#106509] / [fdo#107409])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-glk3/igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-glk8/igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic.html
* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: [PASS][19] -> [FAIL][20] ([fdo#105363])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-glk8/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-glk4/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-hsw: [PASS][21] -> [INCOMPLETE][22] ([fdo#103540])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-hsw6/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-hsw2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-wc:
- shard-skl: [PASS][23] -> [FAIL][24] ([fdo#103167]) +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-skl5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-wc.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-skl4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-wc.html
* igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-render:
- shard-iclb: [PASS][25] -> [FAIL][26] ([fdo#103167]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb5/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb4/igt@[email protected]
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109441]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb4/igt@kms_psr@psr2_no_drrs.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][29] -> [FAIL][30] ([fdo#99912])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-apl3/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-apl2/igt@[email protected]
- shard-hsw: [PASS][31] -> [FAIL][32] ([fdo#99912])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-hsw6/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-hsw7/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@vcs0-s3:
- shard-iclb: [INCOMPLETE][33] ([fdo#107713] / [fdo#109100]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb7/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb1/igt@[email protected]
* igt@gem_exec_schedule@preempt-bsd:
- shard-iclb: [SKIP][35] ([fdo#111325]) -> [PASS][36] +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb2/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb3/igt@[email protected]
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [DMESG-WARN][37] ([fdo#108566]) -> [PASS][38] +3 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-apl4/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-apl1/igt@[email protected]
* igt@i915_pm_rpm@i2c:
- shard-hsw: [FAIL][39] ([fdo#104097]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-hsw5/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-hsw2/igt@[email protected]
* igt@kms_color@pipe-b-ctm-blue-to-red:
- shard-skl: [FAIL][41] ([fdo#107201]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-skl9/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-skl3/igt@[email protected]
* igt@kms_flip@flip-vs-modeset-vs-hang:
- shard-apl: [INCOMPLETE][43] ([fdo#103927]) -> [PASS][44] +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-apl5/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-apl2/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-skl: [INCOMPLETE][45] ([fdo#109507]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-skl2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-skl5/igt@[email protected]
- shard-kbl: [INCOMPLETE][47] ([fdo#103665]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-kbl1/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-kbl3/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt:
- shard-iclb: [FAIL][49] ([fdo#103167]) -> [PASS][50] +2 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-skl: [FAIL][51] ([fdo#103167]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-skl4/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-gtt.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-skl3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-gtt.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-iclb: [INCOMPLETE][53] ([fdo#107713] / [fdo#110042]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb3/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [FAIL][55] ([fdo#108145]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-skl9/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-skl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][57] ([fdo#108145] / [fdo#110403]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-skl1/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-skl1/igt@[email protected]
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [SKIP][59] ([fdo#109441]) -> [PASS][60] +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb1/igt@kms_psr@psr2_sprite_blt.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
* igt@perf@polling:
- shard-skl: [FAIL][61] ([fdo#110728]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-skl7/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-skl6/igt@[email protected]
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][63] ([fdo#109276]) -> [PASS][64] +13 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb6/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb1/igt@[email protected]
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [FAIL][65] ([fdo#111329]) -> [SKIP][66] ([fdo#109276])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6791/shard-iclb2/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/shard-iclb3/igt@[email protected]
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104097]: https://bugs.freedesktop.org/show_bug.cgi?id=104097
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#106509]: https://bugs.freedesktop.org/show_bug.cgi?id=106509
[fdo#107201]: https://bugs.freedesktop.org/show_bug.cgi?id=107201
[fdo#107409]: https://bugs.freedesktop.org/show_bug.cgi?id=107409
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
[fdo#110042]: https://bugs.freedesktop.org/show_bug.cgi?id=110042
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
[fdo#111469]: https://bugs.freedesktop.org/show_bug.cgi?id=111469
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6791 -> Patchwork_14198
CI-20190529: 20190529
CI_DRM_6791: 911cf01f441a754e8ee511d4968f711c54e20ed8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5150: a4e8217bcdfef9bb523f26a9084bbf615a6e8abb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14198: 0101914752f70aa1cf5bd030103f38bdfcfd6a91 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14198/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx