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=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 C747AC55178 for ; Tue, 27 Oct 2020 12:18:39 +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 6EE4C223B0 for ; Tue, 27 Oct 2020 12:18:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6EE4C223B0 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 E1B5A6EB6F; Tue, 27 Oct 2020 12:18:34 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8AA1F6E0EF; Tue, 27 Oct 2020 12:18:33 +0000 (UTC) IronPort-SDR: VNX5c0kWiLbZHZqWKaJV2Xohbby+9lLawyxBULSgZ/cw8j02s+gffWpnBW/a9IOhpTNVGdxJG2 Lh+zP12T/j6g== X-IronPort-AV: E=McAfee;i="6000,8403,9786"; a="164568695" X-IronPort-AV: E=Sophos;i="5.77,423,1596524400"; d="scan'208";a="164568695" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2020 05:18:33 -0700 IronPort-SDR: YNN8Okkn3bb0sf54zIvhyrHLBCwCgglliIlsUhu6t2luMIOo8k3xyma4TyZDFqgIAHtA1fl1Ub nlznqwO5UorA== X-IronPort-AV: E=Sophos;i="5.77,423,1596524400"; d="scan'208";a="303860138" Received: from genxfsim-desktop.iind.intel.com (HELO intel.com) ([10.223.74.178]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2020 05:18:30 -0700 Date: Tue, 27 Oct 2020 17:34:53 +0530 From: Anshuman Gupta To: "Shankar, Uma" Message-ID: <20201027120452.GH29526@intel.com> References: <20201023122112.15265-1-anshuman.gupta@intel.com> <20201023122112.15265-8-anshuman.gupta@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH v3 07/16] drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support 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: "Nikula, Jani" , "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-10-27 at 11:59:14 +0530, Shankar, Uma wrote: > > > > -----Original Message----- > > From: Anshuman Gupta > > Sent: Friday, October 23, 2020 5:51 PM > > To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org > > Cc: seanpaul@chromium.org; Nikula, Jani ; C, > > Ramalingam ; Li, Juston ; > > Shankar, Uma ; Gupta, Anshuman > > > > Subject: [PATCH v3 07/16] drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST > > support > > > > Enable HDCP 1.4 over DP MST for Gen12. > > This also enable the stream encryption support for older generations, which was > > missing earlier. > > > > v2: > > - Added debug print for stream encryption. > > - Disable the hdcp on port after disabling last stream > > encryption. > > Don't see port disable here, Am I missing something. > > > > > Cc: Ramalingam C > > Signed-off-by: Anshuman Gupta > > --- > > drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 ++--- > > drivers/gpu/drm/i915/display/intel_hdcp.c | 46 ++++++++++++++------- > > 2 files changed, 35 insertions(+), 21 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c > > b/drivers/gpu/drm/i915/display/intel_dp_mst.c > > index 16865b200062..f00e12fc83e8 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > > @@ -826,13 +826,9 @@ static struct drm_connector > > *intel_dp_add_mst_connector(struct drm_dp_mst_topolo > > intel_attach_force_audio_property(connector); > > intel_attach_broadcast_rgb_property(connector); > > > > - > > - /* TODO: Figure out how to make HDCP work on GEN12+ */ > > - if (INTEL_GEN(dev_priv) < 12) { > > - ret = intel_dp_init_hdcp(dig_port, intel_connector); > > - if (ret) > > - DRM_DEBUG_KMS("HDCP init failed, skipping.\n"); > > - } > > + ret = intel_dp_init_hdcp(dig_port, intel_connector); > > + if (ret) > > + drm_dbg_kms(&dev_priv->drm, "HDCP init failed, skipping.\n"); > > > > /* > > * Reuse the prop from the SST connector because we're diff --git > > a/drivers/gpu/drm/i915/display/intel_hdcp.c > > b/drivers/gpu/drm/i915/display/intel_hdcp.c > > index 61252d4be3dd..46c9bd588db1 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > > @@ -612,7 +612,12 @@ int intel_hdcp_auth_downstream(struct intel_connector > > *connector) > > return ret; > > } > > > > -/* Implements Part 1 of the HDCP authorization procedure */ > > +/* > > + * Implements Part 1 of the HDCP authorization procedure. > > + * Authentication Part 1 steps for Multi-stream DisplayPort. > > + * Step 1. Auth Part 1 sequence on the driving MST Trasport Link. > > + * Step 2. Enable encryption for each stream that requires encryption. > > + */ > > static int intel_hdcp_auth(struct intel_connector *connector) { > > struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > > @@ -766,10 +771,16 @@ static int intel_hdcp_auth(struct intel_connector > > *connector) > > return -ETIMEDOUT; > > } > > > > - /* > > - * XXX: If we have MST-connected devices, we need to enable encryption > > - * on those as well. > > - */ > > + /* DP MST Auth Part 1 Step 2.a and Step 2.b */ > > + if (shim->stream_encryption) { > > + ret = shim->stream_encryption(dig_port, true); > > + if (ret) { > > + drm_err(&dev_priv->drm, "Failed to enable HDCP 1.4 > > stream enc\n"); > > + return ret; > > + } > > + drm_dbg_kms(&dev_priv->drm, "HDCP 1.4 tras %s stream > > encrypted\n", > > + transcoder_name(hdcp->stream_transcoder)); > > + } > > > > if (repeater_present) > > return intel_hdcp_auth_downstream(connector); > > @@ -790,19 +801,26 @@ static int _intel_hdcp_disable(struct intel_connector > > *connector) > > > > drm_dbg_kms(&dev_priv->drm, "[%s:%d] HDCP is being disabled...\n", > > connector->base.name, connector->base.base.id); > > + /* > > + * Step 1: Deselect HDCP Multiplestream Bit. > > + * Step 2: poll for stream encryption status to be disable. > > + */ > > The above comment should be inside the callback, doesn't add value here. stream_encryption call back is common for enable/disable stream encryption. probbaly it would be better to nuke the above comment in case not adds value here. Thanks, Anshuman. > > > + if (hdcp->shim->stream_encryption) { > > + ret = hdcp->shim->stream_encryption(dig_port, false); > > + if (ret) { > > + drm_err(&dev_priv->drm, "Failed to disable HDCP 1.4 > > stream enc\n"); > > + return ret; > > + } > > + drm_dbg_kms(&dev_priv->drm, "HDCP 1.4 trans %s stream > > encryption disabled\n", > > + transcoder_name(hdcp->stream_transcoder)); > > + } > > > > /* > > - * If there are other connectors on this port using HDCP, don't disable > > - * it. Instead, toggle the HDCP signalling off on that particular > > - * connector/pipe and exit. > > + * If there are other connectors on this port using HDCP, don't disable it. > > + * Repeat steps 1-2 for each stream that no longer requires encryption. > > */ > > - if (dig_port->num_hdcp_streams > 0) { > > - ret = hdcp->shim->toggle_signalling(dig_port, > > - cpu_transcoder, false); > > - if (ret) > > - DRM_ERROR("Failed to disable HDCP signalling\n"); > > + if (dig_port->num_hdcp_streams > 0) > > return ret; > > - } > > > > hdcp->hdcp_encrypted = false; > > intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), 0); > > -- > > 2.26.2 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx