[Intel-gfx] [RFC 6/6] drm/i915/hdcp: Enable HDCP 2.2 MST support

[Anshuman Gupta]

Enable HDCP 2.2 over DP MST.

Cc: Ramalingam C <ramalinga...@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gu...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c 
b/drivers/gpu/drm/i915/display/intel_hdcp.c
index f7ca9dfad825..2498c2c7c245 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1698,6 +1698,14 @@ static int hdcp2_enable_encryption(struct 
intel_connector *connector)
                                    LINK_ENCRYPTION_STATUS,
                                    HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS);
 
+       if (hdcp->shim->stream_2_2_encryption) {
+               ret = hdcp->shim->stream_2_2_encryption(dig_port, true);
+               if (ret) {
+                       drm_err(&dev_priv->drm, "Failed to enable HDCP 2.2 
stream enc\n");
+                       return ret;
+               }
+       }
+
        return ret;
 }
 
@@ -1810,6 +1818,7 @@ static int _intel_hdcp2_disable(struct intel_connector 
*connector)
        struct intel_digital_port *dig_port = 
intel_attached_dig_port(connector);
        struct drm_i915_private *i915 = to_i915(connector->base.dev);
        struct hdcp_port_data *data = &dig_port->port_data;
+       struct intel_hdcp *hdcp = &connector->hdcp;
        int ret;
 
        drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is being Disabled\n",
@@ -1818,6 +1827,14 @@ static int _intel_hdcp2_disable(struct intel_connector 
*connector)
        if (drm_WARN_ON(&i915->drm, data->k < 0))
                return -EINVAL;
 
+       if (dig_port->num_hdcp_streams > 0 && 
hdcp->shim->stream_2_2_encryption) {
+               ret = hdcp->shim->stream_2_2_encryption(dig_port, false);
+               if (ret) {
+                       drm_err(&i915->drm, "Failed to disable HDCP 2.2 stream 
enc\n");
+                       return ret;
+               }
+       }
+
        ret = hdcp2_disable_encryption(connector);
 
        if (hdcp2_deauthenticate_port(connector) < 0)
@@ -2097,7 +2114,7 @@ int intel_hdcp_init(struct intel_connector *connector,
        if (!shim)
                return -EINVAL;
 
-       if (is_hdcp2_supported(dev_priv) && !connector->mst_port)
+       if (is_hdcp2_supported(dev_priv))
                intel_hdcp2_init(connector, port, shim);
 
        ret =
-- 
2.26.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx