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 C96E8C4363A for ; Tue, 27 Oct 2020 07:59:55 +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 70FB12224E for ; Tue, 27 Oct 2020 07:59:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70FB12224E 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 96EC16E19A; Tue, 27 Oct 2020 07:59:54 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 53B156E19A; Tue, 27 Oct 2020 07:59:53 +0000 (UTC) IronPort-SDR: c2lRIUrhdOY8/IXMP9NuRBU443qypD6LNqQyydx+KmqO+NkapM1Dn4GSRSWW22PaltvKdYe+sd KEOa9Mb0IkXw== X-IronPort-AV: E=McAfee;i="6000,8403,9786"; a="185780332" X-IronPort-AV: E=Sophos;i="5.77,423,1596524400"; d="scan'208";a="185780332" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2020 00:59:52 -0700 IronPort-SDR: tBrsPRk/tFA8yBoAkkZgOKR78gsU5lXVRTpWs2xD7yqBq5ecL78oOUBHd2TaBWsSAaZgqA3aRM ZNTA/yWiPXrg== X-IronPort-AV: E=Sophos;i="5.77,423,1596524400"; d="scan'208";a="318144066" Received: from genxfsim-desktop.iind.intel.com (HELO intel.com) ([10.223.74.178]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2020 00:59:49 -0700 Date: Tue, 27 Oct 2020 13:16:11 +0530 From: Anshuman Gupta To: "Shankar, Uma" Message-ID: <20201027074611.GD29526@intel.com> References: <20201023122112.15265-1-anshuman.gupta@intel.com> <20201023122112.15265-7-anshuman.gupta@intel.com> <18153aa8f6144bb181927a88edc744fc@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <18153aa8f6144bb181927a88edc744fc@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH v3 06/16] drm/i915/hdcp: HDCP stream encryption 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:50:13 +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 06/16] drm/i915/hdcp: HDCP stream encryption support > > > > Both HDCP_{1.x,2.x} requires to select/deselect Multistream HDCP bit in > > TRANS_DDI_FUNC_CTL in order to enable/disable stream HDCP encryption over > > DP MST Transport Link. > > > > HDCP 1.4 stream encryption requires to validate the stream encryption status in > > HDCP_STATUS_{TRANSCODER,PORT} register driving that link in order to > > enable/disable the stream encryption. > > > > Both of above requirement are same for all Gen with respect to B.Spec > > Documentation. > > Cc: Ramalingam C > > Signed-off-by: Anshuman Gupta > > --- > > drivers/gpu/drm/i915/display/intel_ddi.c | 10 +-- > > drivers/gpu/drm/i915/display/intel_ddi.h | 6 +- > > .../drm/i915/display/intel_display_types.h | 4 + > > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 80 ++++++++++++++++--- > > drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++-- > > drivers/gpu/drm/i915/i915_reg.h | 1 + > > 6 files changed, 90 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > > b/drivers/gpu/drm/i915/display/intel_ddi.c > > index bf8730267cfd..fbeffdfd1a0d 100644 > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > @@ -1948,9 +1948,9 @@ void intel_ddi_disable_transcoder_func(const struct > > intel_crtc_state *crtc_state > > } > > } > > > > -int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder, > > - enum transcoder cpu_transcoder, > > - bool enable) > > +int intel_ddi_toggle_hdcp_bits(struct intel_encoder *intel_encoder, > > + enum transcoder cpu_transcoder, > > + bool enable, u32 hdcp_mask) > > { > > struct drm_device *dev = intel_encoder->base.dev; > > struct drm_i915_private *dev_priv = to_i915(dev); @@ -1965,9 +1965,9 > > @@ int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder, > > > > tmp = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder)); > > if (enable) > > - tmp |= TRANS_DDI_HDCP_SIGNALLING; > > + tmp |= hdcp_mask; > > else > > - tmp &= ~TRANS_DDI_HDCP_SIGNALLING; > > + tmp &= ~hdcp_mask; > > intel_de_write(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder), tmp); > > intel_display_power_put(dev_priv, intel_encoder->power_domain, > > wakeref); > > return ret; > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.h > > b/drivers/gpu/drm/i915/display/intel_ddi.h > > index dcc711cfe4fe..a4dd815c0000 100644 > > --- a/drivers/gpu/drm/i915/display/intel_ddi.h > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.h > > @@ -50,9 +50,9 @@ u32 bxt_signal_levels(struct intel_dp *intel_dp, > > const struct intel_crtc_state *crtc_state); > > u32 ddi_signal_levels(struct intel_dp *intel_dp, > > const struct intel_crtc_state *crtc_state); -int > > intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder, > > - enum transcoder cpu_transcoder, > > - bool enable); > > +int intel_ddi_toggle_hdcp_bits(struct intel_encoder *intel_encoder, > > + enum transcoder cpu_transcoder, > > + bool enable, u32 hdcp_mask); > > void icl_sanitize_encoder_pll_mapping(struct intel_encoder *encoder); > > > > #endif /* __INTEL_DDI_H__ */ > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > > b/drivers/gpu/drm/i915/display/intel_display_types.h > > index c47124a679b6..59b8fc21e3e8 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > > @@ -339,6 +339,10 @@ struct intel_hdcp_shim { > > enum transcoder cpu_transcoder, > > bool enable); > > > > + /* Enable/Disable stream encryption on DP MST Transport Link */ > > + int (*stream_encryption)(struct intel_digital_port *dig_port, > > + bool enable); > > + > > /* Ensures the link is still protected */ > > bool (*check_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 03424d20e9f7..652d4645f255 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > > @@ -16,6 +16,30 @@ > > #include "intel_dp.h" > > #include "intel_hdcp.h" > > > > +static unsigned int transcoder_to_stream_enc_status(enum transcoder > > +cpu_transcoder) { > > + u32 stream_enc_mask; > > + > > + switch (cpu_transcoder) { > > + case TRANSCODER_A: > > + stream_enc_mask = HDCP_STATUS_STREAM_A_ENC; > > + break; > > + case TRANSCODER_B: > > + stream_enc_mask = HDCP_STATUS_STREAM_B_ENC; > > + break; > > + case TRANSCODER_C: > > + stream_enc_mask = HDCP_STATUS_STREAM_C_ENC; > > + break; > > + case TRANSCODER_D: > > + stream_enc_mask = HDCP_STATUS_STREAM_D_ENC; > > + break; > > + default: > > + stream_enc_mask = 0; > > + } > > + > > + return stream_enc_mask; > > +} > > + > > static void intel_dp_hdcp_wait_for_cp_irq(struct intel_hdcp *hdcp, int timeout) > > { > > long ret; > > @@ -622,24 +646,57 @@ static const struct intel_hdcp_shim > > intel_dp_hdcp_shim = { }; > > > > static int > > -intel_dp_mst_hdcp_toggle_signalling(struct intel_digital_port *dig_port, > > - enum transcoder cpu_transcoder, > > - bool enable) > > +intel_dp_mst_toggle_select_hdcp_stream(struct intel_digital_port *dig_port, > > + bool enable) > > I feel ....toggle_hdcp_stream_select will look better. > > > { > > struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); > > + struct intel_dp *dp = &dig_port->dp; > > + struct intel_hdcp *hdcp = &dp->attached_connector->hdcp; > > int ret; > > > > - if (!enable) > > - usleep_range(6, 60); /* Bspec says >= 6us */ > > Should we not keep this delay. Thanks for comment. As per B.Spec:49289 this delay only requires for HDMI/DVI panel while toggling HDCP signalling. I will fix other comments on this patch. Thanks, Anshuman. > > > - ret = intel_ddi_toggle_hdcp_signalling(&dig_port->base, > > - cpu_transcoder, enable); > > + ret = intel_ddi_toggle_hdcp_bits(&dig_port->base, > > + hdcp->stream_transcoder, enable, > > + TRANS_DDI_HDCP_SELECT); > > if (ret) > > - drm_dbg_kms(&i915->drm, "%s HDCP signalling failed (%d)\n", > > - enable ? "Enable" : "Disable", ret); > > + drm_err(&i915->drm, "%s Multistream HDCP select failed > > This print doesn't sound good, refine it. > > > (%d)\n", > > + enable ? "Enable" : "Disable", ret); > > return ret; > > } > > > > +static int > > +intel_dp_mst_hdcp_strem_encryption(struct intel_digital_port *dig_port, > > + bool enable) > > +{ > > + struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); > > + struct intel_dp *dp = &dig_port->dp; > > + struct intel_hdcp *hdcp = &dp->attached_connector->hdcp; > > + enum port port = dig_port->base.port; > > + enum transcoder cpu_transcoder = hdcp->cpu_transcoder; > > + u32 stream_enc_status; > > + int ret; > > + > > + ret = intel_dp_mst_toggle_select_hdcp_stream(dig_port, enable); > > + if (ret) > > + return ret; > > + > > + stream_enc_status = transcoder_to_stream_enc_status(hdcp- > > >stream_transcoder); > > + if (!stream_enc_status) > > + return -EINVAL; > > + > > + /* Wait for encryption confirmation */ > > + if (intel_de_wait_for_register(i915, > > + HDCP_STATUS(i915, cpu_transcoder, port), > > + stream_enc_status, > > + enable ? stream_enc_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; > > +} > > + > > static > > bool intel_dp_mst_hdcp_check_link(struct intel_digital_port *dig_port, > > struct intel_connector *connector) @@ -673,7 > > +730,8 @@ static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = { > > .read_ksv_ready = intel_dp_hdcp_read_ksv_ready, > > .read_ksv_fifo = intel_dp_hdcp_read_ksv_fifo, > > .read_v_prime_part = intel_dp_hdcp_read_v_prime_part, > > - .toggle_signalling = intel_dp_mst_hdcp_toggle_signalling, > > + .toggle_signalling = intel_dp_hdcp_toggle_signalling, > > + .stream_encryption = intel_dp_mst_hdcp_strem_encryption, > > Typo in stream. > > > .check_link = intel_dp_mst_hdcp_check_link, > > .hdcp_capable = intel_dp_hdcp_capable, > > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c > > b/drivers/gpu/drm/i915/display/intel_hdmi.c > > index f90838bc74fb..f58469226694 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > > @@ -1495,15 +1495,16 @@ static int kbl_repositioning_enc_en_signal(struct > > intel_connector *connector, > > usleep_range(25, 50); > > } > > > > - ret = intel_ddi_toggle_hdcp_signalling(&dig_port->base, cpu_transcoder, > > - false); > > + ret = intel_ddi_toggle_hdcp_bits(&dig_port->base, cpu_transcoder, > > + false, TRANS_DDI_HDCP_SIGNALLING); > > if (ret) { > > drm_err(&dev_priv->drm, > > "Disable HDCP signalling failed (%d)\n", ret); > > return ret; > > } > > - ret = intel_ddi_toggle_hdcp_signalling(&dig_port->base, cpu_transcoder, > > - true); > > + > > + ret = intel_ddi_toggle_hdcp_bits(&dig_port->base, cpu_transcoder, > > + true, TRANS_DDI_HDCP_SIGNALLING); > > if (ret) { > > drm_err(&dev_priv->drm, > > "Enable HDCP signalling failed (%d)\n", ret); @@ -1526,8 > > +1527,9 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port > > *dig_port, > > if (!enable) > > usleep_range(6, 60); /* Bspec says >= 6us */ > > > > - ret = intel_ddi_toggle_hdcp_signalling(&dig_port->base, cpu_transcoder, > > - enable); > > + ret = intel_ddi_toggle_hdcp_bits(&dig_port->base, > > + cpu_transcoder, enable, > > + TRANS_DDI_HDCP_SIGNALLING); > > if (ret) { > > drm_err(&dev_priv->drm, "%s HDCP signalling failed (%d)\n", > > enable ? "Enable" : "Disable", ret); diff --git > > a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index > > d4952c9875fb..86a9a5145e47 100644 > > --- a/drivers/gpu/drm/i915/i915_reg.h > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > @@ -9970,6 +9970,7 @@ enum skl_power_gate { > > #define TRANS_DDI_DP_VC_PAYLOAD_ALLOC (1 << 8) > > #define TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE (1 << 7) #define > > TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ (1 << 6) > > +#define TRANS_DDI_HDCP_SELECT REG_BIT(5) > > #define TRANS_DDI_BFI_ENABLE (1 << 4) > > #define TRANS_DDI_HIGH_TMDS_CHAR_RATE (1 << 4) > > #define TRANS_DDI_HDMI_SCRAMBLING (1 << 0) > > -- > > 2.26.2 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx