drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+
Subsystems (3)
PATCH v4 1/1 drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+
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.
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]
Signed-off-by Ramalingam C <[email protected]>
--- 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 | 120 ++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 8 ++ 4 files changed, 207 insertions(+), 59 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +82 -47
@@ -17,6 +17,7 @@#include "intel_drv.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
@@ -104,24 +105,21 @@ 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 pipe pipe,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, pipe, 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 pipe pipe,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, pipe, port)) & +LINK_ENCRYPTION_STATUS ; } static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,
@@ -253,9 +251,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 pipe pipe,enum port port) { -enum port port = intel_dig_port->base.port; +if (INTEL_GEN (dev_priv) >=12 ) { +switch (pipe) { +case PIPE_A : +return HDCP_TRANSA_REP_PRESENT | +HDCP_TRANSA_SHA1_M0 ; +case PIPE_B : +return HDCP_TRANSB_REP_PRESENT | +HDCP_TRANSB_SHA1_M0 ; +case PIPE_C : +return HDCP_TRANSC_REP_PRESENT | +HDCP_TRANSC_SHA1_M0 ; +/* FIXME: Add a case for PIPE_D */ +default : +DRM_ERROR ("Unknown pipe %d\n" , pipe); +break ; + } +return -EINVAL ; + } +switch (port) {case PORT_A :return HDCP_DDIA_REP_PRESENT |HDCP_DDIA_SHA1_M0 ;
@@ -268,18 +285,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 pipe pipe = connector->hdcp.pipe; +enum port port = intel_dig_port->base.port;u32 vprime, sha_text, sha_leftovers, rep_ctl;int ret, i, j, sha_idx;
@@ -306,7 +326,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, pipe, port);I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_32 );for (i =0 ; i < num_downstream; i++) {unsigned int sha_empty;
@@ -544,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)
@@ -572,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 pipe pipe = connector->hdcp.pipe;enum port port;unsigned long r0_prime_gen_start;int ret, i, tries =2 ;
@@ -611,19 +632,20 @@ 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, pipe, port),get_random_u32 ()); +I915_WRITE (HDCP_CONF (dev_priv, pipe, port),HDCP_CONF_CAPTURE_AN );/* Wait for An to be acquired */ -if (intel_wait_for_register (&dev_priv->uncore,PORT_HDCP_STATUS (port), +if (intel_wait_for_register (&dev_priv->uncore, +HDCP_STATUS (dev_priv, pipe, port),HDCP_STATUS_AN_READY ,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, pipe, port)); + an.reg[1 ] =I915_READ (HDCP_ANHI (dev_priv, pipe, port)); ret = shim->write_an_aksv (intel_dig_port, an.shim);if (ret)return ret;
@@ -641,24 +663,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, pipe, port), bksv.reg[0 ]); +I915_WRITE (HDCP_BKSVHI (dev_priv, pipe, 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, pipe, 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, pipe, 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, pipe, port)) & (HDCP_STATUS_R0_READY |HDCP_STATUS_ENC ),1 )) {DRM_ERROR ("Timed out waiting for R0 ready\n" );return -ETIMEDOUT ;
@@ -686,22 +708,23 @@ 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, pipe, 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, pipe, 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, pipe, port)));return -ETIMEDOUT ; }/* Wait for encryption confirmation */ -if (intel_wait_for_register (&dev_priv->uncore,PORT_HDCP_STATUS (port), +if (intel_wait_for_register (&dev_priv->uncore, +HDCP_STATUS (dev_priv, pipe, port),HDCP_STATUS_ENC ,HDCP_STATUS_ENC ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) {DRM_ERROR ("Timed out waiting for encryption\n" );
@@ -726,15 +749,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 pipe pipe = hdcp->pipe;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 ); +I915_WRITE (HDCP_CONF (dev_priv, pipe, port),0 );if (intel_wait_for_register (&dev_priv->uncore, -PORT_HDCP_STATUS (port), ~0 ,0 , +HDCP_STATUS (dev_priv, pipe, port), ~0 ,0 ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) {DRM_ERROR ("Failed to disable HDCP, timeout clearing status\n" );return -ETIMEDOUT ;
@@ -806,9 +830,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 pipe pipe;int ret =0 ;mutex_lock (&hdcp->mutex); + pipe = hdcp->pipe;/* Check_link valid only when HDCP1.4 is enabled */ if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||
@@ -817,10 +843,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, pipe, 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, pipe, port))); ret = -ENXIO ; hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;schedule_work (&hdcp->prop_work);
@@ -1491,10 +1517,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 pipe pipe = hdcp->pipe;int ret; -WARN_ON (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS ); - +WARN_ON (I915_READ (HDCP2_STATUS (dev_priv, pipe, port)) & +LINK_ENCRYPTION_STATUS );if (hdcp->shim->toggle_signalling) { ret = hdcp->shim->toggle_signalling (intel_dig_port, true);if (ret) {
@@ -1504,14 +1531,15 @@ 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, pipe, 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, pipe, port), +I915_READ (HDCP2_CTL (dev_priv, pipe, port)) |CTL_LINK_ENCRYPTION_REQ ); } - ret =intel_wait_for_register (&dev_priv->uncore,HDCP2_STATUS_DDI (port), + ret =intel_wait_for_register (&dev_priv->uncore, +HDCP2_STATUS (dev_priv, pipe, port),LINK_ENCRYPTION_STATUS ,LINK_ENCRYPTION_STATUS ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS );
@@ -1525,14 +1553,17 @@ 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 pipe pipe = hdcp->pipe;int ret; -WARN_ON (!(I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS )); +WARN_ON (!(I915_READ (HDCP2_STATUS (dev_priv, pipe, port)) & +LINK_ENCRYPTION_STATUS )); +I915_WRITE (HDCP2_CTL (dev_priv, pipe, port), +I915_READ (HDCP2_CTL (dev_priv, pipe, port)) & + ~CTL_LINK_ENCRYPTION_REQ ); -I915_WRITE (HDCP2_CTL_DDI (port), -I915_READ (HDCP2_CTL_DDI (port)) & ~CTL_LINK_ENCRYPTION_REQ ); - - ret =intel_wait_for_register (&dev_priv->uncore,HDCP2_STATUS_DDI (port), + ret =intel_wait_for_register (&dev_priv->uncore, +HDCP2_STATUS (dev_priv, pipe, port),LINK_ENCRYPTION_STATUS ,0x0 ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS );if (ret == -ETIMEDOUT )
@@ -1631,9 +1662,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 pipe pipe;int ret =0 ;mutex_lock (&hdcp->mutex); + pipe = hdcp->pipe;/* hdcp2_check_link is expected only when HDCP2.2 is Enabled */ if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||
@@ -1642,9 +1675,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, pipe, port))) {DRM_ERROR ("HDCP2.2 link stopped the encryption, %x\n" , -I915_READ (HDCP2_STATUS_DDI (port))); +I915_READ (HDCP2_STATUS (dev_priv, pipe, port))); ret = -ENXIO ; hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;schedule_work (&hdcp->prop_work);
@@ -1857,6 +1890,8 @@ int intel_hdcp_enable(struct intel_connector *connector)mutex_lock (&hdcp->mutex);WARN_ON (hdcp->value ==DRM_MODE_CONTENT_PROTECTION_ENABLED ); + hdcp->pipe =intel_connector_get_pipe (connector); +/* * Considering that HDCP2.2 is more secure than HDCP1.4, If the setup * is capable of HDCP2.2, it is preferred to use HDCP2.2.
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 pipe pipe = connector->hdcp.pipe;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, pipe, 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, pipe, 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, pipe, port)));return false; }return true;
drivers/gpu/drm/i915/i915_reg.h +111 -9
161 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +8 -0
@@ -365,6 +365,14 @@ struct intel_hdcp {wait_queue_head_t cp_irq_queue;atomic_t cp_irq_count;int cp_irq_count_cached; + +/* +* Gen 12 onwards, HDCP is part of transcoder(previously DDI). +* So chacheing the pipe associated to connector at hdcp_enable +* would help in subsequent functions to derive the right offsets +* for HDCP registers. +*/ +enum pipe pipe; };struct intel_connector {
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx