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=-13.8 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 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 66C45C4338F for ; Wed, 18 Aug 2021 11:52:02 +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 1F49B6104F for ; Wed, 18 Aug 2021 11:52:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1F49B6104F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BB3B6E55C; Wed, 18 Aug 2021 11:52:01 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 675C56E55C for ; Wed, 18 Aug 2021 11:51:59 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10079"; a="216305363" X-IronPort-AV: E=Sophos;i="5.84,330,1620716400"; d="scan'208";a="216305363" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Aug 2021 04:51:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,330,1620716400"; d="scan'208";a="424225125" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by orsmga003.jf.intel.com with ESMTP; 18 Aug 2021 04:51:56 -0700 Received: from bgsmsx602.gar.corp.intel.com (10.109.78.81) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Wed, 18 Aug 2021 04:51:55 -0700 Received: from bgsmsx604.gar.corp.intel.com (10.67.234.6) by BGSMSX602.gar.corp.intel.com (10.109.78.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Wed, 18 Aug 2021 17:21:52 +0530 Received: from bgsmsx604.gar.corp.intel.com ([10.67.234.6]) by BGSMSX604.gar.corp.intel.com ([10.67.234.6]) with mapi id 15.01.2242.010; Wed, 18 Aug 2021 17:21:52 +0530 From: "Gupta, Anshuman" To: "Li, Juston" , "intel-gfx@lists.freedesktop.org" CC: "seanpaul@chromium.org" , "C, Ramalingam" , "Vivi, Rodrigo" Thread-Topic: [Intel-gfx] [PATCH v5 3/3] drm/i915/hdcp: reuse rx_info for mst stream type1 capability check Thread-Index: AQHXj6ogzBat+9buW06JiP0t4qoVxKt5KUNQ Date: Wed, 18 Aug 2021 11:51:52 +0000 Message-ID: References: <20210812184427.167689-1-juston.li@intel.com> <20210812184427.167689-4-juston.li@intel.com> In-Reply-To: <20210812184427.167689-4-juston.li@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.5.1.3 dlp-reaction: no-action x-originating-ip: [10.223.10.1] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH v5 3/3] drm/i915/hdcp: reuse rx_info for mst stream type1 capability check 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" > -----Original Message----- > From: Li, Juston > Sent: Friday, August 13, 2021 12:14 AM > To: intel-gfx@lists.freedesktop.org > Cc: seanpaul@chromium.org; Gupta, Anshuman ; > C, Ramalingam ; Vivi, Rodrigo > ; Li, Juston > Subject: [Intel-gfx] [PATCH v5 3/3] drm/i915/hdcp: reuse rx_info for mst = stream > type1 capability check >=20 > On some MST docking stations, rx_info can only be read after > RepeaterAuth_Send_ReceiverID_List and the RxStatus READY bit is set other= wise > the read will return -EIO. >=20 > This behavior causes the mst stream type1 capability test to fail to read= rx_info > and determine if the topology supports type1 and fallback to type0. >=20 > To fix this, check for type1 capability when we receive rx_info within th= e AKE > flow when we read RepeaterAuth_Send_ReceiverID_List instead of an explici= t > read just for type1 capability checking. >=20 > This does require moving where we set stream_types to after > hdcp2_authenticate_sink() when we get rx_info but this occurs before we d= o > hdcp2_propagate_stream_management_info. >=20 > Also, legacy HDCP 2.0/2.1 are not type 1 capable either so check for that= as > well. >=20 > Changes since v4: > - move topology_type1_capable to intel_digital_port and rename it as > hdcp_mst_type1_capable (Anshuman) > - make a helper function intel_set_stream_types() to set stream types > in hdcp2_authenticate_and_encrypt() (Anshuman) > - break on failure to set stream types and retry instead of returning > - remove no longer used declaration for streams_type1_capable() >=20 > Changes since v2: > - Remove no longer used variables in _intel_hdcp2_enable() >=20 > Signed-off-by: Juston Li > Reviewed-by: Ramalingam C > --- > .../drm/i915/display/intel_display_types.h | 6 +- > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 39 ----------- > drivers/gpu/drm/i915/display/intel_hdcp.c | 64 +++++++++++-------- > 3 files changed, 38 insertions(+), 71 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index dbdfe54d0340..1f85ff344ab7 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -428,10 +428,6 @@ struct intel_hdcp_shim { > int (*hdcp_2_2_capable)(struct intel_digital_port *dig_port, > bool *capable); >=20 > - /* Detects whether a HDCP 1.4 sink connected in MST topology */ > - int (*streams_type1_capable)(struct intel_connector *connector, > - bool *capable); > - > /* Write HDCP2.2 messages */ > int (*write_2_2_msg)(struct intel_digital_port *dig_port, > void *buf, size_t size); > @@ -1684,6 +1680,8 @@ struct intel_digital_port { > bool hdcp_auth_status; > /* HDCP port data need to pass to security f/w */ > struct hdcp_port_data hdcp_port_data; > + /* Whether the MST topology supports HDCP Type 1 Content */ > + bool hdcp_mst_type1_capable; >=20 > void (*write_infoframe)(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, diff -- > git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > index fbfb3c4d16bb..540a669e01dd 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > @@ -478,23 +478,6 @@ int intel_dp_hdcp2_write_msg(struct intel_digital_po= rt > *dig_port, > return size; > } >=20 > -static int > -get_rxinfo_hdcp_1_dev_downstream(struct intel_digital_port *dig_port, bo= ol > *hdcp_1_x) -{ > - u8 rx_info[HDCP_2_2_RXINFO_LEN]; > - int ret; > - > - ret =3D drm_dp_dpcd_read(&dig_port->dp.aux, > - DP_HDCP_2_2_REG_RXINFO_OFFSET, > - (void *)rx_info, HDCP_2_2_RXINFO_LEN); > - > - if (ret !=3D HDCP_2_2_RXINFO_LEN) > - return ret >=3D 0 ? -EIO : ret; > - > - *hdcp_1_x =3D HDCP_2_2_HDCP1_DEVICE_CONNECTED(rx_info[1]) ? true > : false; > - return 0; > -} > - > static > ssize_t get_receiver_id_list_rx_info(struct intel_digital_port *dig_port= , u32 > *dev_cnt, u8 *byte) { @@ -665,27 +648,6 @@ int > intel_dp_hdcp2_capable(struct intel_digital_port *dig_port, > return 0; > } >=20 > -static > -int intel_dp_mst_streams_type1_capable(struct intel_connector *connector= , > - bool *capable) > -{ > - struct intel_digital_port *dig_port =3D > intel_attached_dig_port(connector); > - struct drm_i915_private *i915 =3D to_i915(dig_port->base.base.dev); > - int ret; > - bool hdcp_1_x; > - > - ret =3D get_rxinfo_hdcp_1_dev_downstream(dig_port, &hdcp_1_x); > - if (ret) { > - drm_dbg_kms(&i915->drm, > - "[%s:%d] failed to read RxInfo ret=3D%d\n", > - connector->base.name, connector->base.base.id, > ret); > - return ret; > - } > - > - *capable =3D !hdcp_1_x; > - return 0; > -} > - > static const struct intel_hdcp_shim intel_dp_hdcp_shim =3D { > .write_an_aksv =3D intel_dp_hdcp_write_an_aksv, > .read_bksv =3D intel_dp_hdcp_read_bksv, > @@ -834,7 +796,6 @@ static const struct intel_hdcp_shim > intel_dp_mst_hdcp_shim =3D { > .stream_2_2_encryption =3D intel_dp_mst_hdcp2_stream_encryption, > .check_2_2_link =3D intel_dp_mst_hdcp2_check_link, > .hdcp_2_2_capable =3D intel_dp_hdcp2_capable, > - .streams_type1_capable =3D intel_dp_mst_streams_type1_capable, > .protocol =3D HDCP_PROTOCOL_DP, > }; >=20 > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c > b/drivers/gpu/drm/i915/display/intel_hdcp.c > index ebc2e32aec0b..f21fcfd2d477 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -33,21 +33,6 @@ static int intel_conn_to_vcpi(struct intel_connector > *connector) > return connector->port ? connector->port->vcpi.vcpi : 0; > } >=20 > -static bool > -intel_streams_type1_capable(struct intel_connector *connector) -{ > - const struct intel_hdcp_shim *shim =3D connector->hdcp.shim; > - bool capable =3D false; > - > - if (!shim) > - return capable; > - > - if (shim->streams_type1_capable) > - shim->streams_type1_capable(connector, &capable); > - > - return capable; > -} > - > /* > * intel_hdcp_required_content_stream selects the most highest common > possible HDCP > * content_type for all streams in DP MST topology because security f/w = doesn't > @@ -86,7 +71,7 @@ intel_hdcp_required_content_stream(struct > intel_digital_port *dig_port) > if (conn_dig_port !=3D dig_port) > continue; >=20 > - if (!enforce_type0 && > !intel_streams_type1_capable(connector)) > + if (!enforce_type0 && !dig_port->hdcp_mst_type1_capable) > enforce_type0 =3D true; >=20 > data->streams[data->k].stream_id =3D > intel_conn_to_vcpi(connector); @@ -112,6 +97,25 @@ > intel_hdcp_required_content_stream(struct intel_digital_port *dig_port) > return 0; > } >=20 > +static int intel_set_stream_type(struct intel_connector *connector) { IMO intel_hdcp_prepare_streams would be more suitable. With above, Reviewed-by: Anshuman Gupta =20 > + struct intel_digital_port *dig_port =3D > intel_attached_dig_port(connector); > + struct hdcp_port_data *data =3D &dig_port->hdcp_port_data; > + struct intel_hdcp *hdcp =3D &connector->hdcp; > + int ret; > + > + if (!intel_encoder_is_mst(intel_attached_encoder(connector))) { > + data->k =3D 1; > + data->streams[0].stream_type =3D hdcp->content_type; > + } else { > + ret =3D intel_hdcp_required_content_stream(dig_port); > + if (ret) > + return ret; > + } > + > + return 0; > +} > + > static > bool intel_hdcp_is_ksv_valid(u8 *ksv) > { > @@ -1632,6 +1636,14 @@ int hdcp2_authenticate_repeater_topology(struct > intel_connector *connector) > return -EINVAL; > } >=20 > + /* > + * MST topology is not Type 1 capable if it contains a downstream > + * device that is only HDCP 1.x or Legacy HDCP 2.0/2.1 compliant. > + */ > + dig_port->hdcp_mst_type1_capable =3D > + !HDCP_2_2_HDCP1_DEVICE_CONNECTED(rx_info[1]) && > + !HDCP_2_2_HDCP_2_0_REP_CONNECTED(rx_info[1]); > + > /* Converting and Storing the seq_num_v to local variable as DWORD */ > seq_num_v =3D > drm_hdcp_be24_to_cpu((const u8 > *)msgs.recvid_list.seq_num_v); @@ -1876,6 +1888,14 @@ static int > hdcp2_authenticate_and_encrypt(struct intel_connector *connector) > for (i =3D 0; i < tries && !dig_port->hdcp_auth_status; i++) { > ret =3D hdcp2_authenticate_sink(connector); > if (!ret) { > + ret =3D intel_set_stream_type(connector); > + if (ret) { > + drm_dbg_kms(&i915->drm, > + "Set stream type failed.(%d)\n", > + ret); > + break; > + } > + > ret =3D > hdcp2_propagate_stream_management_info(connector); > if (ret) { > drm_dbg_kms(&i915->drm, > @@ -1921,9 +1941,7 @@ static int hdcp2_authenticate_and_encrypt(struct > intel_connector *connector) >=20 > static int _intel_hdcp2_enable(struct intel_connector *connector) { > - struct intel_digital_port *dig_port =3D > intel_attached_dig_port(connector); > struct drm_i915_private *i915 =3D to_i915(connector->base.dev); > - struct hdcp_port_data *data =3D &dig_port->hdcp_port_data; > struct intel_hdcp *hdcp =3D &connector->hdcp; > int ret; >=20 > @@ -1931,16 +1949,6 @@ static int _intel_hdcp2_enable(struct > intel_connector *connector) > connector->base.name, connector->base.base.id, > hdcp->content_type); >=20 > - /* Stream which requires encryption */ > - if (!intel_encoder_is_mst(intel_attached_encoder(connector))) { > - data->k =3D 1; > - data->streams[0].stream_type =3D hdcp->content_type; > - } else { > - ret =3D intel_hdcp_required_content_stream(dig_port); > - if (ret) > - return ret; > - } > - > ret =3D hdcp2_authenticate_and_encrypt(connector); > if (ret) { > drm_dbg_kms(&i915->drm, "HDCP2 Type%d Enabling Failed. > (%d)\n", > -- > 2.31.1