From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B9FDC2BB48 for ; Mon, 14 Dec 2020 13:32:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6A3B22571 for ; Mon, 14 Dec 2020 13:32:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6A3B22571 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 254EC6E207; Mon, 14 Dec 2020 13:32:49 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2FD86E202; Mon, 14 Dec 2020 13:32:47 +0000 (UTC) IronPort-SDR: zngP+poXqQc8mimeHa6X7mHBW24FrQpELeL9s42r7JcITmXpFwFq8znPgtp2e0zEdcLxSf/m3r Zbx9eHtma1Gg== X-IronPort-AV: E=McAfee;i="6000,8403,9834"; a="154511482" X-IronPort-AV: E=Sophos;i="5.78,418,1599548400"; d="scan'208";a="154511482" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2020 05:32:47 -0800 IronPort-SDR: Qmwt18SWTsVOqa3d3YsR6popHJBWy3U4AeN/h73nz+KwKcwSe72WrV8PeXvMsKTaMEwN4xKacB s91h1FLwmG2A== X-IronPort-AV: E=Sophos;i="5.78,418,1599548400"; d="scan'208";a="381808214" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.154]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2020 05:32:44 -0800 Date: Mon, 14 Dec 2020 19:02:34 +0530 From: Ramalingam C To: Anshuman Gupta Subject: Re: [PATCH v8 17/19] drm/i915/hdcp: Support for HDCP 2.2 MST shim callbacks Message-ID: <20201214133234.GB22687@intel.com> References: <20201211134244.14588-1-anshuman.gupta@intel.com> <20201211134244.14588-18-anshuman.gupta@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201211134244.14588-18-anshuman.gupta@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org, Karthik B S , dri-devel@lists.freedesktop.org, uma.shankar@intel.com, seanpaul@chromium.org, juston.li@intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 2020-12-11 at 19:12:42 +0530, Anshuman Gupta wrote: > Add support for HDCP 2.2 DP MST shim callback. > This adds existing DP HDCP shim callback for Link Authentication > and Encryption and HDCP 2.2 stream encryption > callback. > > v2: > - Added a WARN_ON() instead of drm_err. [Uma] > - Cosmetic changes. [Uma] > v3: > - 's/port_data/hdcp_port_data' [Ram] > - skip redundant link check. [Ram] > v4: > - use pipe instead of port to access HDCP2_STREAM_STATUS > > Cc: Ramalingam C > Reviewed-by: Uma Shankar Reviewed-by: Ramalingam C > Tested-by: Karthik B S > Signed-off-by: Anshuman Gupta > --- > .../drm/i915/display/intel_display_types.h | 4 + > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 89 +++++++++++++++++-- > 2 files changed, 85 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 63de25b40eff..da91e3f4ff27 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -378,6 +378,10 @@ struct intel_hdcp_shim { > int (*config_stream_type)(struct intel_digital_port *dig_port, > bool is_repeater, u8 type); > > + /* Enable/Disable HDCP 2.2 stream encryption on DP MST Transport Link */ > + int (*stream_2_2_encryption)(struct intel_connector *connector, > + bool enable); > + > /* HDCP2.2 Link Integrity Check */ > int (*check_2_2_link)(struct intel_digital_port *dig_port, > struct intel_connector *connector); > diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > index 9ade1ad3a80c..f372e25edab4 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > @@ -698,18 +698,14 @@ intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector, > return 0; > } > > -static > -bool intel_dp_mst_hdcp_check_link(struct intel_digital_port *dig_port, > - struct intel_connector *connector) > +static bool intel_dp_mst_get_qses_status(struct intel_digital_port *dig_port, > + struct intel_connector *connector) > { > struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); > - struct intel_dp *intel_dp = &dig_port->dp; > struct drm_dp_query_stream_enc_status_ack_reply reply; > + struct intel_dp *intel_dp = &dig_port->dp; > int ret; > > - if (!intel_dp_hdcp_check_link(dig_port, connector)) > - return false; > - > ret = drm_dp_send_query_stream_enc_status(&intel_dp->mst_mgr, > connector->port, &reply); > if (ret) { > @@ -726,6 +722,78 @@ bool intel_dp_mst_hdcp_check_link(struct intel_digital_port *dig_port, > return reply.auth_completed && reply.encryption_enabled; > } > > +static > +bool intel_dp_mst_hdcp_check_link(struct intel_digital_port *dig_port, > + struct intel_connector *connector) > +{ > + if (!intel_dp_hdcp_check_link(dig_port, connector)) > + return false; > + > + return intel_dp_mst_get_qses_status(dig_port, connector); > +} > + > +static int > +intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector, > + bool enable) > +{ > + 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->hdcp_port_data; > + struct intel_hdcp *hdcp = &connector->hdcp; > + enum transcoder cpu_transcoder = hdcp->stream_transcoder; > + enum pipe pipe = (enum pipe)cpu_transcoder; > + enum port port = dig_port->base.port; > + int ret; > + > + drm_WARN_ON(&i915->drm, enable && > + !!(intel_de_read(i915, HDCP2_AUTH_STREAM(i915, cpu_transcoder, port)) > + & AUTH_STREAM_TYPE) != data->streams[0].stream_type); > + > + ret = intel_dp_mst_toggle_hdcp_stream_select(connector, enable); > + if (ret) > + return ret; > + > + /* Wait for encryption confirmation */ > + if (intel_de_wait_for_register(i915, > + HDCP2_STREAM_STATUS(i915, cpu_transcoder, pipe), > + STREAM_ENCRYPTION_STATUS, > + enable ? STREAM_ENCRYPTION_STATUS : 0, > + HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) { > + drm_err(&i915->drm, "Timed out waiting for transcoder: %s stream encryption %s\n", > + transcoder_name(cpu_transcoder), enable ? "enabled" : "disabled"); > + return -ETIMEDOUT; > + } > + > + return 0; > +} > + > +/* > + * DP v2.0 I.3.3 ignore the stream signature L' in QSES reply msg reply. > + * I.3.5 MST source device may use a QSES msg to query downstream status > + * for a particular stream. > + */ > +static > +int intel_dp_mst_hdcp2_check_link(struct intel_digital_port *dig_port, > + struct intel_connector *connector) > +{ > + struct intel_hdcp *hdcp = &connector->hdcp; > + int ret; > + > + /* > + * We do need to do the Link Check only for the connector involved with > + * HDCP port authentication and encryption. > + * We can re-use the hdcp->is_repeater flag to know that the connector > + * involved with HDCP port authentication and encryption. > + */ > + if (hdcp->is_repeater) { > + ret = intel_dp_hdcp2_check_link(dig_port, connector); > + if (ret) > + return ret; > + } > + > + return intel_dp_mst_get_qses_status(dig_port, connector) ? 0 : -EINVAL; > +} > + > static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = { > .write_an_aksv = intel_dp_hdcp_write_an_aksv, > .read_bksv = intel_dp_hdcp_read_bksv, > @@ -739,7 +807,12 @@ static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = { > .stream_encryption = intel_dp_mst_hdcp_stream_encryption, > .check_link = intel_dp_mst_hdcp_check_link, > .hdcp_capable = intel_dp_hdcp_capable, > - > + .write_2_2_msg = intel_dp_hdcp2_write_msg, > + .read_2_2_msg = intel_dp_hdcp2_read_msg, > + .config_stream_type = intel_dp_hdcp2_config_stream_type, > + .stream_2_2_encryption = intel_dp_mst_hdcp2_stream_encryption, > + .check_2_2_link = intel_dp_mst_hdcp2_check_link, > + .hdcp_2_2_capable = intel_dp_hdcp2_capable, > .protocol = HDCP_PROTOCOL_DP, > }; > > -- > 2.26.2 > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CC0FC4361B for ; Mon, 14 Dec 2020 13:32:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E78922571 for ; Mon, 14 Dec 2020 13:32:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E78922571 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BE1716E202; Mon, 14 Dec 2020 13:32:48 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2FD86E202; Mon, 14 Dec 2020 13:32:47 +0000 (UTC) IronPort-SDR: zngP+poXqQc8mimeHa6X7mHBW24FrQpELeL9s42r7JcITmXpFwFq8znPgtp2e0zEdcLxSf/m3r Zbx9eHtma1Gg== X-IronPort-AV: E=McAfee;i="6000,8403,9834"; a="154511482" X-IronPort-AV: E=Sophos;i="5.78,418,1599548400"; d="scan'208";a="154511482" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2020 05:32:47 -0800 IronPort-SDR: Qmwt18SWTsVOqa3d3YsR6popHJBWy3U4AeN/h73nz+KwKcwSe72WrV8PeXvMsKTaMEwN4xKacB s91h1FLwmG2A== X-IronPort-AV: E=Sophos;i="5.78,418,1599548400"; d="scan'208";a="381808214" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.154]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2020 05:32:44 -0800 Date: Mon, 14 Dec 2020 19:02:34 +0530 From: Ramalingam C To: Anshuman Gupta Message-ID: <20201214133234.GB22687@intel.com> References: <20201211134244.14588-1-anshuman.gupta@intel.com> <20201211134244.14588-18-anshuman.gupta@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201211134244.14588-18-anshuman.gupta@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v8 17/19] drm/i915/hdcp: Support for HDCP 2.2 MST shim callbacks X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, seanpaul@chromium.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 2020-12-11 at 19:12:42 +0530, Anshuman Gupta wrote: > Add support for HDCP 2.2 DP MST shim callback. > This adds existing DP HDCP shim callback for Link Authentication > and Encryption and HDCP 2.2 stream encryption > callback. > > v2: > - Added a WARN_ON() instead of drm_err. [Uma] > - Cosmetic changes. [Uma] > v3: > - 's/port_data/hdcp_port_data' [Ram] > - skip redundant link check. [Ram] > v4: > - use pipe instead of port to access HDCP2_STREAM_STATUS > > Cc: Ramalingam C > Reviewed-by: Uma Shankar Reviewed-by: Ramalingam C > Tested-by: Karthik B S > Signed-off-by: Anshuman Gupta > --- > .../drm/i915/display/intel_display_types.h | 4 + > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 89 +++++++++++++++++-- > 2 files changed, 85 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 63de25b40eff..da91e3f4ff27 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -378,6 +378,10 @@ struct intel_hdcp_shim { > int (*config_stream_type)(struct intel_digital_port *dig_port, > bool is_repeater, u8 type); > > + /* Enable/Disable HDCP 2.2 stream encryption on DP MST Transport Link */ > + int (*stream_2_2_encryption)(struct intel_connector *connector, > + bool enable); > + > /* HDCP2.2 Link Integrity Check */ > int (*check_2_2_link)(struct intel_digital_port *dig_port, > struct intel_connector *connector); > diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > index 9ade1ad3a80c..f372e25edab4 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > @@ -698,18 +698,14 @@ intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector, > return 0; > } > > -static > -bool intel_dp_mst_hdcp_check_link(struct intel_digital_port *dig_port, > - struct intel_connector *connector) > +static bool intel_dp_mst_get_qses_status(struct intel_digital_port *dig_port, > + struct intel_connector *connector) > { > struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); > - struct intel_dp *intel_dp = &dig_port->dp; > struct drm_dp_query_stream_enc_status_ack_reply reply; > + struct intel_dp *intel_dp = &dig_port->dp; > int ret; > > - if (!intel_dp_hdcp_check_link(dig_port, connector)) > - return false; > - > ret = drm_dp_send_query_stream_enc_status(&intel_dp->mst_mgr, > connector->port, &reply); > if (ret) { > @@ -726,6 +722,78 @@ bool intel_dp_mst_hdcp_check_link(struct intel_digital_port *dig_port, > return reply.auth_completed && reply.encryption_enabled; > } > > +static > +bool intel_dp_mst_hdcp_check_link(struct intel_digital_port *dig_port, > + struct intel_connector *connector) > +{ > + if (!intel_dp_hdcp_check_link(dig_port, connector)) > + return false; > + > + return intel_dp_mst_get_qses_status(dig_port, connector); > +} > + > +static int > +intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector, > + bool enable) > +{ > + 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->hdcp_port_data; > + struct intel_hdcp *hdcp = &connector->hdcp; > + enum transcoder cpu_transcoder = hdcp->stream_transcoder; > + enum pipe pipe = (enum pipe)cpu_transcoder; > + enum port port = dig_port->base.port; > + int ret; > + > + drm_WARN_ON(&i915->drm, enable && > + !!(intel_de_read(i915, HDCP2_AUTH_STREAM(i915, cpu_transcoder, port)) > + & AUTH_STREAM_TYPE) != data->streams[0].stream_type); > + > + ret = intel_dp_mst_toggle_hdcp_stream_select(connector, enable); > + if (ret) > + return ret; > + > + /* Wait for encryption confirmation */ > + if (intel_de_wait_for_register(i915, > + HDCP2_STREAM_STATUS(i915, cpu_transcoder, pipe), > + STREAM_ENCRYPTION_STATUS, > + enable ? STREAM_ENCRYPTION_STATUS : 0, > + HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) { > + drm_err(&i915->drm, "Timed out waiting for transcoder: %s stream encryption %s\n", > + transcoder_name(cpu_transcoder), enable ? "enabled" : "disabled"); > + return -ETIMEDOUT; > + } > + > + return 0; > +} > + > +/* > + * DP v2.0 I.3.3 ignore the stream signature L' in QSES reply msg reply. > + * I.3.5 MST source device may use a QSES msg to query downstream status > + * for a particular stream. > + */ > +static > +int intel_dp_mst_hdcp2_check_link(struct intel_digital_port *dig_port, > + struct intel_connector *connector) > +{ > + struct intel_hdcp *hdcp = &connector->hdcp; > + int ret; > + > + /* > + * We do need to do the Link Check only for the connector involved with > + * HDCP port authentication and encryption. > + * We can re-use the hdcp->is_repeater flag to know that the connector > + * involved with HDCP port authentication and encryption. > + */ > + if (hdcp->is_repeater) { > + ret = intel_dp_hdcp2_check_link(dig_port, connector); > + if (ret) > + return ret; > + } > + > + return intel_dp_mst_get_qses_status(dig_port, connector) ? 0 : -EINVAL; > +} > + > static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = { > .write_an_aksv = intel_dp_hdcp_write_an_aksv, > .read_bksv = intel_dp_hdcp_read_bksv, > @@ -739,7 +807,12 @@ static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = { > .stream_encryption = intel_dp_mst_hdcp_stream_encryption, > .check_link = intel_dp_mst_hdcp_check_link, > .hdcp_capable = intel_dp_hdcp_capable, > - > + .write_2_2_msg = intel_dp_hdcp2_write_msg, > + .read_2_2_msg = intel_dp_hdcp2_read_msg, > + .config_stream_type = intel_dp_hdcp2_config_stream_type, > + .stream_2_2_encryption = intel_dp_mst_hdcp2_stream_encryption, > + .check_2_2_link = intel_dp_mst_hdcp2_check_link, > + .hdcp_2_2_capable = intel_dp_hdcp2_capable, > .protocol = HDCP_PROTOCOL_DP, > }; > > -- > 2.26.2 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx