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.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 3B931C433E0 for ; Wed, 15 Jul 2020 19:13:36 +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 169432076C for ; Wed, 15 Jul 2020 19:13:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 169432076C 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 A94D76E23D; Wed, 15 Jul 2020 19:13:35 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 303316E26C for ; Wed, 15 Jul 2020 19:13:34 +0000 (UTC) IronPort-SDR: 7Co3X0q9LAZY42ycnoTFsJ6bM6AtPErgOiZf+7krzNH1uBxNf3ZdA35fmQXf4ICwrltOavILUk cdkGIxt3s3zQ== X-IronPort-AV: E=McAfee;i="6000,8403,9683"; a="128820552" X-IronPort-AV: E=Sophos;i="5.75,356,1589266800"; d="scan'208";a="128820552" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2020 12:13:33 -0700 IronPort-SDR: Piiin40sA7TqnAMBcR+4AT/qkDNA1of+2TcB3pJs5kl5m/MD3+gkQxnnF39Dsj8eZ5pmbzKN9t ArxO9A5QPY1w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,356,1589266800"; d="scan'208";a="300018189" Received: from labuser-z97x-ud5h.jf.intel.com (HELO intel.com) ([10.165.21.211]) by orsmga002.jf.intel.com with ESMTP; 15 Jul 2020 12:13:33 -0700 Date: Wed, 15 Jul 2020 12:15:35 -0700 From: Manasi Navare To: Imre Deak Message-ID: <20200715191514.GA23149@intel.com> References: <20200715162931.30168-1-imre.deak@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200715162931.30168-1-imre.deak@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) 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: , 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 07:29:31PM +0300, Imre Deak wrote: > The problem the reverted patch revealed could've been fixed by commit > 619ad4874585 ("drm/i915/ddi: Don't frob the DP link scramble disabling fl= ag") > in particular because the revealed problem (at least in one case) happened > when switching to the TPS4 training pattern, which needs scrambling. > = > Let's try applying the HBR3 fix again. > = > 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/i9= 15/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 function > * will return true, and false otherwise. > + * > + * This function is not safe to use prior to encoder type being set. > */ > 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_digital_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