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=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 9B5B4C2D0A3 for ; Fri, 6 Nov 2020 11:11:41 +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 14A25208B3 for ; Fri, 6 Nov 2020 11:11:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 14A25208B3 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 33DC289F55; Fri, 6 Nov 2020 11:11:40 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 56EC289F55 for ; Fri, 6 Nov 2020 11:11:38 +0000 (UTC) IronPort-SDR: XpIctrKP1yatS9OFm0nfQ+w3PBXGzxe0r+rDNELRkR4/RvzlkxTb892R5ska3bkjdXcGMl3ab/ gAsXUWXfwJpA== X-IronPort-AV: E=McAfee;i="6000,8403,9796"; a="166023041" X-IronPort-AV: E=Sophos;i="5.77,456,1596524400"; d="scan'208";a="166023041" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2020 03:11:37 -0800 IronPort-SDR: 7Tj/QLuLWh2HQmbwxt6N/VgSDG+NcIWnAkB5AeKYJvkAHdOx02NlF9hGgbl+h9PF+ZAAJkymln iHf4NdwC+Fzw== X-IronPort-AV: E=Sophos;i="5.77,456,1596524400"; d="scan'208";a="539802554" Received: from unknown (HELO intel.com) ([10.99.66.154]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2020 03:11:36 -0800 Date: Fri, 6 Nov 2020 16:42:21 +0530 From: Ramalingam C To: Anshuman Gupta Message-ID: <20201106111221.GB12843@intel.com> References: <20201027164208.10026-16-anshuman.gupta@intel.com> <20201103062700.5416-1-anshuman.gupta@intel.com> <20201106092724.GA12408@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201106092724.GA12408@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v4 15/16] 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: intel-gfx@lists.freedesktop.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-11-06 at 14:57:25 +0530, Ramalingam C wrote: > On 2020-11-03 at 11:57:00 +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] > > Reviewed-by: Ramalingam C I think we can improvise further here. > > > > Cc: Ramalingam C > > Reviewed-by: Uma Shankar > > Signed-off-by: Anshuman Gupta > > --- > > .../drm/i915/display/intel_display_types.h | 4 + > > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 80 +++++++++++++++++-- > > 2 files changed, 76 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 dfb5be64e03a..4cbb151ff3cf 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > > @@ -374,6 +374,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_digital_port *dig_port, > > + 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 4be61e7fde4e..35c1543fe0e2 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_digital_port *dig_port, > > 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) { > > @@ -722,6 +718,69 @@ 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_digital_port *dig_port, > > + bool enable) > > +{ > > + struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); > > + struct hdcp_port_data *data = &dig_port->port_data; > > + struct intel_dp *dp = &dig_port->dp; > > + struct intel_hdcp *hdcp = &dp->attached_connector->hdcp; > > + enum port port = dig_port->base.port; > > + /* HDCP2.x register uses stream transcoder */ > > + enum transcoder cpu_transcoder = hdcp->stream_transcoder; > > + 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(dig_port, enable); > > + if (ret) > > + return ret; > > + > > + /* Wait for encryption confirmation */ > > + if (intel_de_wait_for_register(i915, > > + HDCP2_STREAM_STATUS(i915, cpu_transcoder, port), > > + STREAM_ENCRYPTION_STATUS, > > + enable ? STREAM_ENCRYPTION_STATUS : 0, > > + HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) { > > + drm_err(&i915->drm, "Timed out waiting for stream encryption %s\n", > > + 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) > > +{ Since on MST topology only for connector with mst transcoder hdcp authentication will be done. all other connectors' hdcp enable are just enabling the stream encryption. So the check link is needed for the port which has done the real hdcp authentication. other hdcp instances need the qses check for the stream encryption status check. this can be combined schedule the check_link{1.4, 2.2) work only for the connector with mst transcoder. and in that check_link work, do the qses check for all the connectors on that mst topology and then do the real check_link for the mst port alone. This way we avoid the three to four instance of check link delayed work with one. -Ram > > + int ret; > > + > > + 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, > > @@ -735,7 +794,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 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx