drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+
Subsystems (5)
v7 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.
v7:
port, transcoder definitions are kept within I915. corresponding changes in i915-mei interface.
Ramalingam C (6):
drm/i915: mei_hdcp: I915 sends ddi index as per ME FW
drm: port definition is moved back into i915 header
drm: I915 mei interface is extended for transcoder info misc/mei/hdcp: transcoder index in port info drm/i915/hdcp: updating the transcoder of the hdcp port drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+
drivers/gpu/drm/i915/display/intel_bios.h | 2 + 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 | 191 +++++++++++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 + drivers/gpu/drm/i915/display/intel_hdmi.c | 12 +- 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 ++- 13 files changed, 348 insertions(+), 120 deletions(-)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v7 1/6 drm/i915: mei_hdcp: I915 sends ddi index as per ME FW
I915 will convert it's port value into ddi index defiend by ME FW and will pass it as part of hdcp_port_data structure.
Hence we are exposing the enum mei_fw_ddi to I915 through i915_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 v7 2/6 drm: port definition is moved back into i915 header
In reply to Ramalingam CHandled the need for exposing enum port to mei_hdcp driver, by converting the port into ddi index as per ME FW.
Hence enum port definition moved into I915 driver itself.
--- drivers/gpu/drm/i915/display/intel_bios.h | 2 ++ drivers/gpu/drm/i915/display/intel_display.h | 18 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.h | 1 + include/drm/i915_drm.h | 18 ------------------ 4 files changed, 21 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/display/intel_bios.h +2 -0
@@ -34,6 +34,8 @@#include <drm/i915_drm.h> +#include "intel_display.h" +struct drm_i915_private ;enum intel_backlight_type {
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
@@ -11,6 +11,7 @@#include <drm/i915_drm.h> #include "i915_reg.h" +#include "intel_display.h" enum pipe ;struct drm_connector_state ;
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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v8 2/6 drm: port definition is moved back into i915 header
Handled the need for exposing enum port to mei_hdcp driver, by converting the port into ddi index as per ME FW.
Hence enum port definition moved into I915 driver itself.
v2:
intel_display.h is included in intel_hdcp.h
--- drivers/gpu/drm/i915/display/intel_bios.h | 2 ++ 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 | 2 ++ include/drm/i915_drm.h | 18 ------------------ 5 files changed, 23 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/display/intel_bios.h +2 -0
@@ -34,6 +34,8 @@#include <drm/i915_drm.h> +#include "intel_display.h" +struct drm_i915_private ;enum intel_backlight_type {
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
@@ -11,6 +11,7 @@#include <drm/i915_drm.h> #include "i915_reg.h" +#include "intel_display.h" enum pipe ;struct drm_connector_state ;
drivers/gpu/drm/i915/display/intel_hdcp.h +2 -0
@@ -10,6 +10,8 @@#include <drm/i915_drm.h> +#include "intel_display.h" +struct drm_connector ;struct drm_connector_state ;struct drm_i915_private ;
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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v7 2/6] drm: port definition is moved back into i915 header
In reply to Ramalingam CQuoted 4 lines · Ramalingam C
Handled the need for exposing enum port to
mei_hdcpdriver, by converting the port into ddi index as per ME FW.Hence enum port definition moved into I915 driver itself.
For future reference, please consider using the imperative style in the commit message. For example, "move port definition back to i915 header", "Hence move enum port definition into i915 driver itself", etc.
There were some complaints from CI, please make sure this builds with CONFIG_DRM_I915_WERROR=y.
Quoted 90 lines
Signed-off-by Ramalingam C <[email protected]>--- drivers/gpu/drm/i915/display/intel_bios.h | 2 ++ drivers/gpu/drm/i915/display/intel_display.h | 18 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.h | 1 + include/drm/i915_drm.h | 18 ------------------ 4 files changed, 21 insertions(+), 18 deletions(-)drivers/gpu/drm/i915/display/intel_bios.h +2
-0@@ -34,6 +34,8 @@#include <drm/i915_drm.h> +#include "intel_display.h" +struct drm_i915_private ;enum intel_backlight_type {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@@ -11,6 +11,7 @@#include <drm/i915_drm.h> #include "i915_reg.h" +#include "intel_display.h" enum pipe ;struct drm_connector_state ;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 · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v7 3/6 drm: I915 mei interface is extended for transcoder info
In reply to Ramalingam CI915 needs to send the index of the transcoder as per ME FW. To support this, enum mei_fw_ddi is defined and added as a member into the struct hdcp_port_data.
--- 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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 4/6 misc/mei/hdcp: 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.
--- 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
PATCH v7 5/6 drm/i915/hdcp: updating the transcoder of the hdcp port
In reply to Ramalingam COn gen12+ platforms, HDCP HW is associated to the transcoder. Hence on every modeset associated transcoder is updated into the intel_hdcp.
--- .../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 | 49 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 + drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++ 5 files changed, 63 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 trans; };struct intel_connector {
drivers/gpu/drm/i915/display/intel_dp.c +3 -0
@@ -2244,6 +2244,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 +48 -1
61 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_hdcp.h +2 -0
@@ -19,6 +19,8 @@ struct intel_hdcp_shim;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 trans);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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 5/6] drm/i915/hdcp: updating the transcoder of the hdcp port
Quoted 18 lines · Ramalingam C
On gen12+ platforms, HDCP HW is associated to the transcoder. Hence on every modeset associated transcoder is updated into the
intel_hdcp.Signed-off-by Ramalingam C <[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 | 49 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 + drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++ 5 files changed, 63 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_display_types.h +0
-0
drivers/gpu/drm/i915/display/intel_display_types.h struct intel_hdcp { · line 397
Quoted 10 lines
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 trans;
$ git grep "enum transcoder" -- drivers/gpu/drm/i915/
Please call this cpu_transcoder.
Quoted 22 lines
drivers/gpu/drm/i915/display/intel_display_types.h +0
-0};struct intel_connector {drivers/gpu/drm/i915/display/intel_dp.c +3
-0@@ -2244,6 +2244,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
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port) · line 1766
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +2
-0@@ -1762,13 +1762,60 @@ 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 tc)
enum transcoder trancoder or enum transcoder cpu_transcoder.
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +7
-0+{ +switch (tc) { + case TRANSCODER_A ... TRANSCODER_D: +return (enum mei_fw_tc )(tc |0x10 ); +case TRANSCODER_EDP : +return MEI_TC_EDP ; +case TRANSCODER_DSI_0 :
drivers/gpu/drm/i915/display/intel_hdcp.c enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port) · line 1783
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +10
-0+return MEI_TC_DSI0 ; +case TRANSCODER_DSI_1 : +return MEI_TC_DSI1 ; +default : +return MEI_INVALID_TRANSCODER ; + } +} + +void intel_hdcp_transcoder_config (struct intel_connector *connector, +enum transcoder trans)
enum transcoder trancoder or enum transcoder cpu_transcoder.
Quoted 44 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +29
-1+{ +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->trans = trans; + hdcp->port_data.fw_tc =intel_get_mei_fw_tc (trans); +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); + }else { + crtc =to_intel_crtc (connector->base.state->crtc); +if (crtc) { + hdcp->trans = crtc->config->cpu_transcoder; + data->fw_tc =intel_get_mei_fw_tc (hdcp->trans); + } + data->fw_ddi =intel_get_mei_fw_ddi_index (PORT_NONE ); + } - 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/gpu/drm/i915/display/intel_hdcp.h +0
-0
drivers/gpu/drm/i915/display/intel_hdcp.h struct intel_hdcp_shim; · line 23
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_hdcp.h +2
-0@@ -19,6 +19,8 @@ struct intel_hdcp_shim;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 trans);
enum transcoder trancoder or enum transcoder cpu_transcoder.
Quoted 16 lines
drivers/gpu/drm/i915/display/intel_hdcp.h +0
-0int 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 · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v7 6/6 drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+
In reply to Ramalingam CFrom 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.
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 129 +++++++++++++--------- drivers/gpu/drm/i915/display/intel_hdmi.c | 9 +- drivers/gpu/drm/i915/i915_reg.h | 124 +++++++++++++++++++-- 3 files changed, 199 insertions(+), 63 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +78 -51
@@ -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,17 @@ 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 tc,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, tc, 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 tc,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, tc, port)) & +LINK_ENCRYPTION_STATUS ; } static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,
@@ -253,9 +247,28 @@ 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 tc,enum port port) { -enum port port = intel_dig_port->base.port; +if (INTEL_GEN (dev_priv) >=12 ) { +switch (tc) { +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 ; +/* FIXME: Add a case for PIPE_D */ +default : +DRM_ERROR ("Unknown transcoder %d\n" , tc); +break ; + } +return -EINVAL ; + } +switch (port) {case PORT_A :return HDCP_DDIA_REP_PRESENT |HDCP_DDIA_SHA1_M0 ;
@@ -268,18 +281,21 @@ 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 : +DRM_ERROR ("Unknown port %d\n" , port);break ; } -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 tc = connector->hdcp.trans; +enum port port = intel_dig_port->base.port;u32 vprime, sha_text, sha_leftovers, rep_ctl;int ret, i, j, sha_idx;
@@ -306,7 +322,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, tc, 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 +564,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 +592,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 tc = connector->hdcp.trans;enum port port;unsigned long r0_prime_gen_start;int ret, i, tries =2 ;
@@ -615,18 +632,18 @@ 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, tc, port),get_random_u32 ()); +I915_WRITE (HDCP_CONF (dev_priv, tc, 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, tc, 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, tc, port)); + an.reg[1 ] =I915_READ (HDCP_ANHI (dev_priv, tc, port)); ret = shim->write_an_aksv (intel_dig_port, an.shim);if (ret)return ret;
@@ -644,24 +661,24 @@ 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, tc, port), bksv.reg[0 ]); +I915_WRITE (HDCP_BKSVHI (dev_priv, tc, 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, tc, 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, tc, 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, tc, port)) & (HDCP_STATUS_R0_READY |HDCP_STATUS_ENC ),1 )) {DRM_ERROR ("Timed out waiting for R0 ready\n" );return -ETIMEDOUT ;
@@ -689,22 +706,22 @@ 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, tc, 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, tc, 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, tc, 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, tc, port),HDCP_STATUS_ENC ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) {DRM_ERROR ("Timed out waiting for encryption\n" );
@@ -729,15 +746,16 @@ 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 tc = hdcp->trans;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, tc, port),0 ); +if (intel_de_wait_for_clear (dev_priv,HDCP_STATUS (dev_priv, tc, port), + ~0 ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) {DRM_ERROR ("Failed to disable HDCP, timeout clearing status\n" );return -ETIMEDOUT ; }
@@ -808,9 +826,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 tc;int ret =0 ;mutex_lock (&hdcp->mutex); + tc = hdcp->trans;/* Check_link valid only when HDCP1.4 is enabled */ if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||
@@ -819,10 +839,10 @@ 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, tc, 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, tc, port))); ret = -ENXIO ; hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;schedule_work (&hdcp->prop_work);
@@ -1493,10 +1513,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 tc = hdcp->trans;int ret; -WARN_ON (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS ); - +WARN_ON (I915_READ (HDCP2_STATUS (dev_priv, tc, port)) & +LINK_ENCRYPTION_STATUS );if (hdcp->shim->toggle_signalling) { ret = hdcp->shim->toggle_signalling (intel_dig_port, true);if (ret) {
@@ -1506,14 +1527,14 @@ 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, tc, 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, tc, port), +I915_READ (HDCP2_CTL (dev_priv, tc, 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, tc, port),LINK_ENCRYPTION_STATUS ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS );
@@ -1526,14 +1547,18 @@ 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 tc = hdcp->trans;int ret; -WARN_ON (!(I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS )); +WARN_ON (!(I915_READ (HDCP2_STATUS (dev_priv, tc, 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, tc, port), +I915_READ (HDCP2_CTL (dev_priv, tc, 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, tc, port),LINK_ENCRYPTION_STATUS ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS );if (ret == -ETIMEDOUT )
@@ -1632,9 +1657,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 tc;int ret =0 ;mutex_lock (&hdcp->mutex); + tc = hdcp->trans;/* hdcp2_check_link is expected only when HDCP2.2 is Enabled */ if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||
@@ -1643,9 +1670,9 @@ 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, tc, port))) {DRM_ERROR ("HDCP2.2 link stopped the encryption, %x\n" , -I915_READ (HDCP2_STATUS_DDI (port))); +I915_READ (HDCP2_STATUS (dev_priv, tc, port))); ret = -ENXIO ; hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;schedule_work (&hdcp->prop_work);
drivers/gpu/drm/i915/display/intel_hdmi.c +6 -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 tc = connector->hdcp.trans;int ret;union {u32 reg;
@@ -1502,13 +1505,13 @@ 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, tc, 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, tc, 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, tc, 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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v7 6/6] drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+
Quoted 47 lines · Ramalingam C
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_TRANSis 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 ini915_reg.h[Shashank] unused variables "reg" is removed.
v6:
Configuring the transcoder atcompute_config. transcoder is used instead of pipe in macros. Rebased.
v7:
transcoder is cached atintel_hdcp
hdcp_port_datais configured with transcoder index asper ME FW.Signed-off-by Ramalingam C <[email protected]>Reviewed-by Shashank Sharma <[email protected]> [v5]--- drivers/gpu/drm/i915/display/intel_hdcp.c | 129 +++++++++++++--------- drivers/gpu/drm/i915/display/intel_hdmi.c | 9 +- drivers/gpu/drm/i915/i915_reg.h | 124 +++++++++++++++++++-- 3 files changed, 199 insertions(+), 63 deletions(-)drivers/gpu/drm/i915/display/intel_hdcp.c +1
-0@@ -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
drivers/gpu/drm/i915/display/intel_hdcp.c bool intel_hdcp2_capable(struct intel_connector *connector) · line 110
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +2
-1@@ -105,24 +106,17 @@ 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 tc,enum port port)
enum transcoder trancoder or enum transcoder cpu_transcoder.
same throughout.
BR,
Jani.
Quoted 516 lines
drivers/gpu/drm/i915/display/intel_hdcp.c +75
-50{ -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, tc, 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 tc,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, tc, port)) & +LINK_ENCRYPTION_STATUS ; } static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,@@ -253,9 +247,28 @@ 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 tc,enum port port) { -enum port port = intel_dig_port->base.port; +if (INTEL_GEN (dev_priv) >=12 ) { +switch (tc) { +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 ; +/* FIXME: Add a case for PIPE_D */ +default : +DRM_ERROR ("Unknown transcoder %d\n" , tc); +break ; + } +return -EINVAL ; + } +switch (port) {case PORT_A :return HDCP_DDIA_REP_PRESENT |HDCP_DDIA_SHA1_M0 ;@@ -268,18 +281,21 @@ 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 : +DRM_ERROR ("Unknown port %d\n" , port);break ; } -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 tc = connector->hdcp.trans; +enum port port = intel_dig_port->base.port;u32 vprime, sha_text, sha_leftovers, rep_ctl;int ret, i, j, sha_idx;@@ -306,7 +322,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, tc, 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 +564,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 +592,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 tc = connector->hdcp.trans;enum port port;unsigned long r0_prime_gen_start;int ret, i, tries =2 ;@@ -615,18 +632,18 @@ 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, tc, port),get_random_u32 ()); +I915_WRITE (HDCP_CONF (dev_priv, tc, 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, tc, 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, tc, port)); + an.reg[1 ] =I915_READ (HDCP_ANHI (dev_priv, tc, port)); ret = shim->write_an_aksv (intel_dig_port, an.shim);if (ret)return ret;@@ -644,24 +661,24 @@ 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, tc, port), bksv.reg[0 ]); +I915_WRITE (HDCP_BKSVHI (dev_priv, tc, 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, tc, 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, tc, 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, tc, port)) & (HDCP_STATUS_R0_READY |HDCP_STATUS_ENC ),1 )) {DRM_ERROR ("Timed out waiting for R0 ready\n" );return -ETIMEDOUT ;@@ -689,22 +706,22 @@ 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, tc, 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, tc, 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, tc, 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, tc, port),HDCP_STATUS_ENC ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) {DRM_ERROR ("Timed out waiting for encryption\n" );@@ -729,15 +746,16 @@ 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 tc = hdcp->trans;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, tc, port),0 ); +if (intel_de_wait_for_clear (dev_priv,HDCP_STATUS (dev_priv, tc, port), + ~0 ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) {DRM_ERROR ("Failed to disable HDCP, timeout clearing status\n" );return -ETIMEDOUT ; }@@ -808,9 +826,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 tc;int ret =0 ;mutex_lock (&hdcp->mutex); + tc = hdcp->trans;/* Check_link valid only when HDCP1.4 is enabled */ if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||@@ -819,10 +839,10 @@ 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, tc, 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, tc, port))); ret = -ENXIO ; hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;schedule_work (&hdcp->prop_work);@@ -1493,10 +1513,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 tc = hdcp->trans;int ret; -WARN_ON (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS ); - +WARN_ON (I915_READ (HDCP2_STATUS (dev_priv, tc, port)) & +LINK_ENCRYPTION_STATUS );if (hdcp->shim->toggle_signalling) { ret = hdcp->shim->toggle_signalling (intel_dig_port, true);if (ret) {@@ -1506,14 +1527,14 @@ 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, tc, 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, tc, port), +I915_READ (HDCP2_CTL (dev_priv, tc, 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, tc, port),LINK_ENCRYPTION_STATUS ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS );@@ -1526,14 +1547,18 @@ 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 tc = hdcp->trans;int ret; -WARN_ON (!(I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS )); +WARN_ON (!(I915_READ (HDCP2_STATUS (dev_priv, tc, 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, tc, port), +I915_READ (HDCP2_CTL (dev_priv, tc, 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, tc, port),LINK_ENCRYPTION_STATUS ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS );if (ret == -ETIMEDOUT )@@ -1632,9 +1657,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 tc;int ret =0 ;mutex_lock (&hdcp->mutex); + tc = hdcp->trans;/* hdcp2_check_link is expected only when HDCP2.2 is Enabled */ if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||@@ -1643,9 +1670,9 @@ 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, tc, port))) {DRM_ERROR ("HDCP2.2 link stopped the encryption, %x\n" , -I915_READ (HDCP2_STATUS_DDI (port))); +I915_READ (HDCP2_STATUS (dev_priv, tc, port))); ret = -ENXIO ; hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;schedule_work (&hdcp->prop_work);drivers/gpu/drm/i915/display/intel_hdmi.c +6
-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 tc = connector->hdcp.trans;int ret;union {u32 reg;@@ -1502,13 +1505,13 @@ 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, tc, 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, tc, 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, tc, port)));return false; }return true;drivers/gpu/drm/i915/i915_reg.h +115
-9@@ -9256,12 +9256,20 @@ enum skl_power_gate {/* HDCP Repeater Registers */ #define HDCP_REP_CTL _MMIO(0x66d00) +#define HDCP_TRANSA_REP_PRESENT BIT(31) +#define HDCP_TRANSB_REP_PRESENT BIT(30) +#define HDCP_TRANSC_REP_PRESENT BIT(29) +#define HDCP_TRANSD_REP_PRESENT BIT(28)#define HDCP_DDIB_REP_PRESENT BIT(30)#define HDCP_DDIA_REP_PRESENT BIT(29)#define HDCP_DDIC_REP_PRESENT BIT(28)#define HDCP_DDID_REP_PRESENT BIT(27)#define HDCP_DDIF_REP_PRESENT BIT(26)#define HDCP_DDIE_REP_PRESENT BIT(25) +#define HDCP_TRANSA_SHA1_M0 (1 << 20) +#define HDCP_TRANSB_SHA1_M0 (2 << 20) +#define HDCP_TRANSC_SHA1_M0 (3 << 20) +#define HDCP_TRANSD_SHA1_M0 (4 << 20)#define HDCP_DDIB_SHA1_M0 (1 << 20)#define HDCP_DDIA_SHA1_M0 (2 << 20)#define HDCP_DDIC_SHA1_M0 (3 << 20)@@ -9301,15 +9309,92 @@ enum skl_power_gate { _PORTE_HDCP_AUTHENC, \ _PORTF_HDCP_AUTHENC) + (x))#define PORT_HDCP_CONF (port) _PORT_HDCP_AUTHENC(port, 0x0) +#define _TRANSA_HDCP_CONF 0x66400 +#define _TRANSB_HDCP_CONF 0x66500 +#define TRANS_HDCP_CONF (trans) _MMIO_TRANS(trans, _TRANSA_HDCP_CONF, \ + _TRANSB_HDCP_CONF) +#define HDCP_CONF (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_CONF(trans) : \ + PORT_HDCP_CONF(port)) +#define HDCP_CONF_CAPTURE_AN BIT(0)#define HDCP_CONF_AUTH_AND_ENC (BIT(1) | BIT(0))#define PORT_HDCP_ANINIT (port) _PORT_HDCP_AUTHENC(port, 0x4) +#define _TRANSA_HDCP_ANINIT 0x66404 +#define _TRANSB_HDCP_ANINIT 0x66504 +#define TRANS_HDCP_ANINIT (trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP_ANINIT, \ + _TRANSB_HDCP_ANINIT) +#define HDCP_ANINIT (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_ANINIT(trans) : \ + PORT_HDCP_ANINIT(port)) +#define PORT_HDCP_ANLO (port) _PORT_HDCP_AUTHENC(port, 0x8) +#define _TRANSA_HDCP_ANLO 0x66408 +#define _TRANSB_HDCP_ANLO 0x66508 +#define TRANS_HDCP_ANLO (trans) _MMIO_TRANS(trans, _TRANSA_HDCP_ANLO, \ + _TRANSB_HDCP_ANLO) +#define HDCP_ANLO (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_ANLO(trans) : \ + PORT_HDCP_ANLO(port)) +#define PORT_HDCP_ANHI (port) _PORT_HDCP_AUTHENC(port, 0xC) +#define _TRANSA_HDCP_ANHI 0x6640C +#define _TRANSB_HDCP_ANHI 0x6650C +#define TRANS_HDCP_ANHI (trans) _MMIO_TRANS(trans, _TRANSA_HDCP_ANHI, \ + _TRANSB_HDCP_ANHI) +#define HDCP_ANHI (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_ANHI(trans) : \ + PORT_HDCP_ANHI(port)) +#define PORT_HDCP_BKSVLO (port) _PORT_HDCP_AUTHENC(port, 0x10) +#define _TRANSA_HDCP_BKSVLO 0x66410 +#define _TRANSB_HDCP_BKSVLO 0x66510 +#define TRANS_HDCP_BKSVLO (trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP_BKSVLO, \ + _TRANSB_HDCP_BKSVLO) +#define HDCP_BKSVLO (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_BKSVLO(trans) : \ + PORT_HDCP_BKSVLO(port)) +#define PORT_HDCP_BKSVHI (port) _PORT_HDCP_AUTHENC(port, 0x14) +#define _TRANSA_HDCP_BKSVHI 0x66414 +#define _TRANSB_HDCP_BKSVHI 0x66514 +#define TRANS_HDCP_BKSVHI (trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP_BKSVHI, \ + _TRANSB_HDCP_BKSVHI) +#define HDCP_BKSVHI (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_BKSVHI(trans) : \ + PORT_HDCP_BKSVHI(port)) +#define PORT_HDCP_RPRIME (port) _PORT_HDCP_AUTHENC(port, 0x18) +#define _TRANSA_HDCP_RPRIME 0x66418 +#define _TRANSB_HDCP_RPRIME 0x66518 +#define TRANS_HDCP_RPRIME (trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP_RPRIME, \ + _TRANSB_HDCP_RPRIME) +#define HDCP_RPRIME (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_RPRIME(trans) : \ + PORT_HDCP_RPRIME(port)) +#define PORT_HDCP_STATUS (port) _PORT_HDCP_AUTHENC(port, 0x1C) +#define _TRANSA_HDCP_STATUS 0x6641C +#define _TRANSB_HDCP_STATUS 0x6651C +#define TRANS_HDCP_STATUS (trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP_STATUS, \ + _TRANSB_HDCP_STATUS) +#define HDCP_STATUS (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_STATUS(trans) : \ + PORT_HDCP_STATUS(port)) +#define HDCP_STATUS_STREAM_A_ENC BIT(31)#define HDCP_STATUS_STREAM_B_ENC BIT(30)#define HDCP_STATUS_STREAM_C_ENC BIT(29)@@ -9336,23 +9421,44 @@ enum skl_power_gate { _PORTD_HDCP2_BASE, \ _PORTE_HDCP2_BASE, \ _PORTF_HDCP2_BASE) + (x)) - -#define HDCP2_AUTH_DDI (port) _PORT_HDCP2_BASE(port, 0x98) +#define PORT_HDCP2_AUTH (port) _PORT_HDCP2_BASE(port, 0x98) +#define _TRANSA_HDCP2_AUTH 0x66498 +#define _TRANSB_HDCP2_AUTH 0x66598 +#define TRANS_HDCP2_AUTH (trans) _MMIO_TRANS(trans, _TRANSA_HDCP2_AUTH, \ + _TRANSB_HDCP2_AUTH)#define AUTH_LINK_AUTHENTICATED BIT(31)#define AUTH_LINK_TYPE BIT(30)#define AUTH_FORCE_CLR_INPUTCTR BIT(19)#define AUTH_CLR_KEYS BIT(18) - -#define HDCP2_CTL_DDI (port) _PORT_HDCP2_BASE(port, 0xB0) +#define HDCP2_AUTH (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP2_AUTH(trans) : \ + PORT_HDCP2_AUTH(port)) + +#define PORT_HDCP2_CTL (port) _PORT_HDCP2_BASE(port, 0xB0) +#define _TRANSA_HDCP2_CTL 0x664B0 +#define _TRANSB_HDCP2_CTL 0x665B0 +#define TRANS_HDCP2_CTL (trans) _MMIO_TRANS(trans, _TRANSA_HDCP2_CTL, \ + _TRANSB_HDCP2_CTL)#define CTL_LINK_ENCRYPTION_REQ BIT(31) - -#define HDCP2_STATUS_DDI (port) _PORT_HDCP2_BASE(port, 0xB4) -#define STREAM_ENCRYPTION_STATUS_A BIT(31) -#define STREAM_ENCRYPTION_STATUS_B BIT(30) -#define STREAM_ENCRYPTION_STATUS_C BIT(29) +#define HDCP2_CTL (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP2_CTL(trans) : \ + PORT_HDCP2_CTL(port)) + +#define PORT_HDCP2_STATUS (port) _PORT_HDCP2_BASE(port, 0xB4) +#define _TRANSA_HDCP2_STATUS 0x664B4 +#define _TRANSB_HDCP2_STATUS 0x665B4 +#define TRANS_HDCP2_STATUS (trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP2_STATUS, \ + _TRANSB_HDCP2_STATUS)#define LINK_TYPE_STATUS BIT(22)#define LINK_AUTH_STATUS BIT(21)#define LINK_ENCRYPTION_STATUS BIT(20) +#define HDCP2_STATUS (dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP2_STATUS(trans) : \ + PORT_HDCP2_STATUS(port))/* Per-pipe DDI Function Control */ #define _TRANS_DDI_FUNC_CTL_A 0x60400
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ (rev5)
In reply to Ramalingam C== Series Details ==
== Series Details ==
Series: drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ (rev5)
URL : https://patchwork.freedesktop.org/series/63432/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC drivers/gpu/drm/i915/display/intel_dvo.h.s
CC drivers/gpu/drm/i915/display/intel_crt.h.s
CC drivers/gpu/drm/i915/display/intel_gmbus.h.s
CC drivers/gpu/drm/i915/display/intel_display_types.h.s
CC drivers/gpu/drm/i915/display/intel_dsi.h.s
CC drivers/gpu/drm/i915/display/intel_atomic_plane.h.s
CC drivers/gpu/drm/i915/display/intel_combo_phy.h.s
CC drivers/gpu/drm/i915/display/intel_overlay.h.s
CC drivers/gpu/drm/i915/display/intel_panel.h.s
CC drivers/gpu/drm/i915/display/intel_dp_link_training.h.s
CC drivers/gpu/drm/i915/display/intel_dp_aux_backlight.h.s
CC drivers/gpu/drm/i915/display/intel_bios.h.s
CC drivers/gpu/drm/i915/display/intel_opregion.h.s
CC drivers/gpu/drm/i915/display/intel_lspcon.h.s
CC drivers/gpu/drm/i915/display/intel_dp_mst.h.s
CC drivers/gpu/drm/i915/display/intel_pipe_crc.h.s
CC drivers/gpu/drm/i915/display/intel_fifo_underrun.h.s
CC drivers/gpu/drm/i915/display/intel_display_power.h.s
CC drivers/gpu/drm/i915/display/intel_connector.h.s
CC drivers/gpu/drm/i915/display/intel_tv.h.s
CC drivers/gpu/drm/i915/display/intel_hdcp.h.s
In file included from <command-line>:0:0:
./drivers/gpu/drm/i915/display/intel_hdcp.h:23:12: error: ‘enum transcoder’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
enum transcoder trans);
^~~~~~~~~~
./drivers/gpu/drm/i915/display/intel_hdcp.h:28:64: error: ‘enum port’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port);
^~~~cc1: all warnings being treated as errorsscripts/Makefile.build:308: recipe for target 'drivers/gpu/drm/i915/display/intel_hdcp.h.s' failed make[5]: *** [drivers/gpu/drm/i915/display/intel_hdcp.h.s] Error 1 scripts/Makefile.build:497: recipe for target 'drivers/gpu/drm/i915/display' failed make[4]: *** [drivers/gpu/drm/i915/display] Error 2scripts/Makefile.build:497: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:497: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:497: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1083: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Ramalingam C
Enabling the HDCP1.4 and 2.2 on TGL by supporting the HW block movement from DDI into transcoder.
v7:
port, transcoder definitions are kept within I915. corresponding changes in i915-mei interface.
I had some superficial comments here and there, won't do detailed review of the series, but I like this overall approach better than exposing the definitions from i915.
Quoted 23 lines
Ramalingam C (6):
drm/i915:mei_hdcp: I915 sends ddi index as per ME FW
drm: port definition is moved back into i915 header
drm: I915 mei interface is extended for transcoder info misc/mei/hdcp: transcoder index in port info drm/i915/hdcp: updating the transcoder of the hdcp port drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+drivers/gpu/drm/i915/display/intel_bios.h | 2 + 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 | 191 +++++++++++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 + drivers/gpu/drm/i915/display/intel_hdmi.c | 12 +- 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 ++- 13 files changed, 348 insertions(+), 120 deletions(-)
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.BUILD: failure for drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ (rev6)
In reply to Ramalingam C== Series Details ==
== Series Details ==
Series: drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ (rev6)
URL : https://patchwork.freedesktop.org/series/63432/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC drivers/gpu/drm/i915/display/intel_dvo.h.s
CC drivers/gpu/drm/i915/display/intel_gmbus.h.s
CC drivers/gpu/drm/i915/display/intel_display_types.h.s
CC drivers/gpu/drm/i915/display/intel_dsi.h.s
CC drivers/gpu/drm/i915/display/intel_atomic_plane.h.s
CC drivers/gpu/drm/i915/display/intel_combo_phy.h.s
CC drivers/gpu/drm/i915/display/intel_overlay.h.s
CC drivers/gpu/drm/i915/display/intel_panel.h.s
CC drivers/gpu/drm/i915/display/intel_dp_link_training.h.s
CC drivers/gpu/drm/i915/display/intel_dp_aux_backlight.h.s
CC drivers/gpu/drm/i915/display/intel_bios.h.s
CC drivers/gpu/drm/i915/display/intel_opregion.h.s
CC drivers/gpu/drm/i915/display/intel_lspcon.h.s
CC drivers/gpu/drm/i915/display/intel_dp_mst.h.s
CC drivers/gpu/drm/i915/display/intel_pipe_crc.h.s
CC drivers/gpu/drm/i915/display/intel_fifo_underrun.h.s
CC drivers/gpu/drm/i915/display/intel_quirks.h.s
CC drivers/gpu/drm/i915/display/intel_display_power.h.s
CC drivers/gpu/drm/i915/display/intel_connector.h.s
CC drivers/gpu/drm/i915/display/intel_tv.h.s
CC drivers/gpu/drm/i915/display/intel_hdcp.h.s
CC drivers/gpu/drm/i915/display/intel_color.h.s
CC drivers/gpu/drm/i915/display/intel_dvo_dev.h.s
CC drivers/gpu/drm/i915/display/intel_sdvo_regs.h.s
CC drivers/gpu/drm/i915/display/intel_lpe_audio.h.s
CC drivers/gpu/drm/i915/display/intel_sdvo.h.s
In file included from <command-line>:0:0:
./drivers/gpu/drm/i915/display/intel_sdvo.h:21:29: error: ‘enum port’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
i915_reg_t reg, enum port port);
^~~~cc1: all warnings being treated as errorsscripts/Makefile.build:308: recipe for target 'drivers/gpu/drm/i915/display/intel_sdvo.h.s' failed make[5]: *** [drivers/gpu/drm/i915/display/intel_sdvo.h.s] Error 1 scripts/Makefile.build:497: recipe for target 'drivers/gpu/drm/i915/display' failed make[4]: *** [drivers/gpu/drm/i915/display] Error 2scripts/Makefile.build:497: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:497: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:497: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1083: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx