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 DA754C388F2 for ; Fri, 6 Nov 2020 07:47:38 +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 5EBBC2087D for ; Fri, 6 Nov 2020 07:47:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5EBBC2087D 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 B9FEC6E08A; Fri, 6 Nov 2020 07:47:37 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id D54116E08A; Fri, 6 Nov 2020 07:47:35 +0000 (UTC) IronPort-SDR: VXIHH+e87SNr8zfBVbqq8GaVWwlvL7MtE8ENM/Q/EKCKiSx8u97SPGhLt2d347m3PQ4y13ym0j psGpLloD875w== X-IronPort-AV: E=McAfee;i="6000,8403,9796"; a="148793061" X-IronPort-AV: E=Sophos;i="5.77,455,1596524400"; d="scan'208";a="148793061" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2020 23:47:35 -0800 IronPort-SDR: BMtCUndFfDFLZ8LDf974hwEa1QYgxj68gxb2w9pk7tSs+t8IxFnBRCsvQL96QsjhDbdUUvPWKQ IQ5/D7aH9i+A== X-IronPort-AV: E=Sophos;i="5.77,455,1596524400"; d="scan'208";a="471979932" Received: from unknown (HELO intel.com) ([10.99.66.154]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2020 23:47:32 -0800 Date: Fri, 6 Nov 2020 13:18:16 +0530 From: Ramalingam C To: Anshuman Gupta Message-ID: <20201106074816.GA11924@intel.com> References: <20201027164208.10026-1-anshuman.gupta@intel.com> <20201027164208.10026-9-anshuman.gupta@intel.com> <20201105163912.GL3242@intel.com> <20201106045034.GQ29526@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201106045034.GQ29526@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v4 08/16] drm/i915/hdcp: Pass dig_port to intel_hdcp_init 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-11-06 at 10:20:35 +0530, Anshuman Gupta wrote: > On 2020-11-05 at 22:09:12 +0530, Ramalingam C wrote: > > On 2020-10-27 at 22:12:00 +0530, Anshuman Gupta wrote: > > > Pass dig_port as an argument to intel_hdcp_init() > > > and intel_hdcp2_init(). > > > This will be required for HDCP 2.2 stream encryption. > > > > > > Cc: Ramalingam C > > > Reviewed-by: Uma Shankar > > > Signed-off-by: Anshuman Gupta > > > --- > > > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 4 ++-- > > > drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +++++++----- > > > drivers/gpu/drm/i915/display/intel_hdcp.h | 4 +++- > > > drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- > > > 4 files changed, 13 insertions(+), 9 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > > > index 6dcbfaffd2c5..591b68e5de48 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > > > +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > > > @@ -751,10 +751,10 @@ int intel_dp_init_hdcp(struct intel_digital_port *dig_port, > > > return 0; > > > > > > if (intel_connector->mst_port) > > > - return intel_hdcp_init(intel_connector, port, > > > + return intel_hdcp_init(intel_connector, dig_port, > > cant we retrieve the dig_port from connector? > No, actually intel_hdcp_init get called for DP MST in atomic check phase, > in atomic check phase DP MST connector->encoder is not initialize yet, > it initialize with DP MST encoder in commit phase. > so using intel_attached_dig_port(connector) results in OOPS in intel_hdcp_init(). Oh ok. Otherwise LGTM Reviewed-by: Ramalingam C > Thanks, > Anshuman Gupta. > > > > -Ram > > > &intel_dp_mst_hdcp_shim); > > > else if (!intel_dp_is_edp(intel_dp)) > > > - return intel_hdcp_init(intel_connector, port, > > > + return intel_hdcp_init(intel_connector, dig_port, > > > &intel_dp_hdcp_shim); > > > > > > return 0; > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > > > index 937af4aeaac2..b0f47687bc59 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > > > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > > > @@ -1982,12 +1982,13 @@ static enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder) > > > } > > > > > > static int initialize_hdcp_port_data(struct intel_connector *connector, > > > - enum port port, > > > + struct intel_digital_port *dig_port, > > > const struct intel_hdcp_shim *shim) > > > { > > > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > > > struct intel_hdcp *hdcp = &connector->hdcp; > > > struct hdcp_port_data *data = &hdcp->port_data; > > > + enum port port = dig_port->base.port; > > > > > > if (INTEL_GEN(dev_priv) < 12) > > > data->fw_ddi = intel_get_mei_fw_ddi_index(port); > > > @@ -2060,14 +2061,15 @@ void intel_hdcp_component_init(struct drm_i915_private *dev_priv) > > > } > > > } > > > > > > -static void intel_hdcp2_init(struct intel_connector *connector, enum port port, > > > +static void intel_hdcp2_init(struct intel_connector *connector, > > > + struct intel_digital_port *dig_port, > > > const struct intel_hdcp_shim *shim) > > > { > > > struct drm_i915_private *i915 = to_i915(connector->base.dev); > > > struct intel_hdcp *hdcp = &connector->hdcp; > > > int ret; > > > > > > - ret = initialize_hdcp_port_data(connector, port, shim); > > > + ret = initialize_hdcp_port_data(connector, dig_port, shim); > > > if (ret) { > > > drm_dbg_kms(&i915->drm, "Mei hdcp data init failed\n"); > > > return; > > > @@ -2077,7 +2079,7 @@ static void intel_hdcp2_init(struct intel_connector *connector, enum port port, > > > } > > > > > > int intel_hdcp_init(struct intel_connector *connector, > > > - enum port port, > > > + struct intel_digital_port *dig_port, > > > const struct intel_hdcp_shim *shim) > > > { > > > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > > > @@ -2088,7 +2090,7 @@ int intel_hdcp_init(struct intel_connector *connector, > > > return -EINVAL; > > > > > > if (is_hdcp2_supported(dev_priv) && !connector->mst_port) > > > - intel_hdcp2_init(connector, port, shim); > > > + intel_hdcp2_init(connector, dig_port, shim); > > > > > > ret = > > > drm_connector_attach_content_protection_property(&connector->base, > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h > > > index b912a3a0f5b8..8f53b0c7fe5c 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_hdcp.h > > > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h > > > @@ -18,13 +18,15 @@ struct intel_connector; > > > struct intel_crtc_state; > > > struct intel_encoder; > > > struct intel_hdcp_shim; > > > +struct intel_digital_port; > > > enum port; > > > enum transcoder; > > > > > > void intel_hdcp_atomic_check(struct drm_connector *connector, > > > struct drm_connector_state *old_state, > > > struct drm_connector_state *new_state); > > > -int intel_hdcp_init(struct intel_connector *connector, enum port port, > > > +int intel_hdcp_init(struct intel_connector *connector, > > > + struct intel_digital_port *dig_port, > > > const struct intel_hdcp_shim *hdcp_shim); > > > int intel_hdcp_enable(struct intel_connector *connector, > > > const struct intel_crtc_state *pipe_config, u8 content_type); > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c > > > index f58469226694..0788de04711b 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > > > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > > > @@ -3302,7 +3302,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port, > > > intel_hdmi->attached_connector = intel_connector; > > > > > > if (is_hdcp_supported(dev_priv, port)) { > > > - int ret = intel_hdcp_init(intel_connector, port, > > > + int ret = intel_hdcp_init(intel_connector, dig_port, > > > &intel_hdmi_hdcp_shim); > > > if (ret) > > > drm_dbg_kms(&dev_priv->drm, > > > -- > > > 2.26.2 > > > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx