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.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 6DEA3C433E1 for ; Wed, 15 Jul 2020 23:34: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 46F68206D5 for ; Wed, 15 Jul 2020 23:34:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46F68206D5 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 D64D86E083; Wed, 15 Jul 2020 23:34:40 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1DCBE6E083 for ; Wed, 15 Jul 2020 23:34:40 +0000 (UTC) IronPort-SDR: NGpf3Oi2C82T9ChrCIlhpXJ9fPwOF6BPxTJphUAMoT74zm4Cm01JLeoOidLrBRd7MrpQVYPN/a kpT5y4PLoWAQ== X-IronPort-AV: E=McAfee;i="6000,8403,9683"; a="150676436" X-IronPort-AV: E=Sophos;i="5.75,357,1589266800"; d="scan'208";a="150676436" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2020 16:34:35 -0700 IronPort-SDR: LHxwej/FCfX5ImrrsCNqR9cSZtQFZTcI1GKKNTr1PN0wID+OwrRRjp0wWOBVfFovleClEpnn+l RzZjEMFF+z3g== X-IronPort-AV: E=Sophos;i="5.75,357,1589266800"; d="scan'208";a="460267503" Received: from ideak-desk.fi.intel.com ([10.237.68.147]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2020 16:34:33 -0700 Date: Thu, 16 Jul 2020 02:34:23 +0300 From: Imre Deak To: Matt Atwood Message-ID: <20200715233423.GA10705@ideak-desk.fi.intel.com> References: <20200715162931.30168-1-imre.deak@intel.com> <20200715191514.GA23149@intel.com> <20200715202715.GB25551@ideak-desk.fi.intel.com> <20200715231609.GA3869@msatwood-mobl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200715231609.GA3869@msatwood-mobl> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH] Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+"" 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: , Reply-To: imre.deak@intel.com Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Jul 15, 2020 at 04:16:09PM -0700, Matt Atwood wrote: > On Wed, Jul 15, 2020 at 11:27:15PM +0300, Imre Deak wrote: > > On Wed, Jul 15, 2020 at 12:15:35PM -0700, Manasi Navare wrote: > > > On Wed, Jul 15, 2020 at 07:29:31PM +0300, Imre Deak wrote: > > > > The problem the reverted patch revealed could've been fixed by comm= it > > > > 619ad4874585 ("drm/i915/ddi: Don't frob the DP link scramble disabl= ing flag") > > > > in particular because the revealed problem (at least in one case) h= appened > > > > when switching to the TPS4 training pattern, which needs scrambling. > > > > = > > > > Let's try applying the HBR3 fix again. > > = > > The link training failure still happens the same way on fi-icl-u2. > Previously this only failed on a specific TGL CI system, did you get > failures on both this go around? ICL passed last time. Arg, it's fi-tgl-u2, sorry for the mixup. For instance: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-tgl-u2/dmesg0.t= xt https://patchwork.freedesktop.org/series/79486/ would be another thing to try. > > = > > > > = > > > > This reverts commit d3913019602e32ef6fbba8eb0167e83250cdab22. > > > > = > > > > Cc: Matt Atwood > > > > Cc: Ville Syrj=E4l=E4 > > > > Cc: Manasi Navare > > > > Cc: Jos=E9 Roberto de Souza > > > > Signed-off-by: Imre Deak > > > = > > > Makes sense since the problem occured only in CI, not on > > > the local testing done by Matt on his eDP panel. > > > = > > > Reviewed-by: Manasi Navare > > > = > > > Manasi > > > = > > > > --- > > > > drivers/gpu/drm/i915/display/intel_dp.c | 28 ++++++++++-----------= ---- > > > > 1 file changed, 11 insertions(+), 17 deletions(-) > > > > = > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/= drm/i915/display/intel_dp.c > > > > index d6295eb20b63..a5ab405d3a12 100644 > > > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > > > @@ -137,6 +137,8 @@ static const u8 valid_dsc_slicecount[] =3D {1, = 2, 4}; > > > > * > > > > * If a CPU or PCH DP output is attached to an eDP panel, this fun= ction > > > > * will return true, and false otherwise. > > > > + * > > > > + * This function is not safe to use prior to encoder type being se= t. > > > > */ > > > > bool intel_dp_is_edp(struct intel_dp *intel_dp) > > > > { > > > > @@ -8157,8 +8159,6 @@ intel_dp_init_connector(struct intel_digital_= port *dig_port, > > > > intel_encoder->base.name)) > > > > return false; > > > > = > > > > - intel_dp_set_source_rates(intel_dp); > > > > - > > > > intel_dp->reset_link_params =3D true; > > > > intel_dp->pps_pipe =3D INVALID_PIPE; > > > > intel_dp->active_pipe =3D INVALID_PIPE; > > > > @@ -8174,28 +8174,22 @@ intel_dp_init_connector(struct intel_digita= l_port *dig_port, > > > > */ > > > > drm_WARN_ON(dev, intel_phy_is_tc(dev_priv, phy)); > > > > type =3D DRM_MODE_CONNECTOR_eDP; > > > > + intel_encoder->type =3D INTEL_OUTPUT_EDP; > > > > + > > > > + /* eDP only on port B and/or C on vlv/chv */ > > > > + if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) || > > > > + IS_CHERRYVIEW(dev_priv)) && > > > > + port !=3D PORT_B && port !=3D PORT_C)) > > > > + return false; > > > > } else { > > > > type =3D DRM_MODE_CONNECTOR_DisplayPort; > > > > } > > > > = > > > > + intel_dp_set_source_rates(intel_dp); > > > > + > > > > if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > > > > intel_dp->active_pipe =3D vlv_active_pipe(intel_dp); > > > > = > > > > - /* > > > > - * For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but > > > > - * for DP the encoder type can be set by the caller to > > > > - * INTEL_OUTPUT_UNKNOWN for DDI, so don't rewrite it. > > > > - */ > > > > - if (type =3D=3D DRM_MODE_CONNECTOR_eDP) > > > > - intel_encoder->type =3D INTEL_OUTPUT_EDP; > > > > - > > > > - /* eDP only on port B and/or C on vlv/chv */ > > > > - if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) || > > > > - IS_CHERRYVIEW(dev_priv)) && > > > > - intel_dp_is_edp(intel_dp) && > > > > - port !=3D PORT_B && port !=3D PORT_C)) > > > > - return false; > > > > - > > > > drm_dbg_kms(&dev_priv->drm, > > > > "Adding %s connector on [ENCODER:%d:%s]\n", > > > > type =3D=3D DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP", > > > > -- = > > > > 2.23.1 > > > > = _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx