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=-8.2 required=3.0 tests=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 04EA5C433DF for ; Thu, 4 Jun 2020 18:34:44 +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 DAA31206A2 for ; Thu, 4 Jun 2020 18:34:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DAA31206A2 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 854E589FE3; Thu, 4 Jun 2020 18:34:43 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id C496989FE3 for ; Thu, 4 Jun 2020 18:34:42 +0000 (UTC) IronPort-SDR: 2wlAONsEd7f4F34p16jv1mGQ6wDec6pK/i0lt5ApSWtkRSHFjyMsfsWjh+wB2R8sRpKyXYv6lX LTCfFJJ0+4BA== 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; 04 Jun 2020 11:34:42 -0700 IronPort-SDR: ITII+JOPCqTshZH2gFCZIcBayzZEiZIfE92RqpDta0kmu9+qvMfjXWf66shA/6Es3fgG+rk+ev mG0glCAyErYg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,472,1583222400"; d="scan'208";a="417003933" Received: from labuser-z97x-ud5h.jf.intel.com (HELO intel.com) ([10.165.21.211]) by orsmga004.jf.intel.com with ESMTP; 04 Jun 2020 11:34:42 -0700 Date: Thu, 4 Jun 2020 11:35:30 -0700 From: Manasi Navare To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Message-ID: <20200604183530.GB3922@intel.com> References: <20200604002359.17128-1-manasi.d.navare@intel.com> <20200604152543.GU6112@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200604152543.GU6112@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [Intel-gfx] [PATCH] drm/i915/dp: Reset link params on connector disconnect 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 Thu, Jun 04, 2020 at 06:25:43PM +0300, Ville Syrj=E4l=E4 wrote: > On Wed, Jun 03, 2020 at 05:23:59PM -0700, Manasi Navare wrote: > > We have noticed that when link training fails the panel > > sends a long pulse indicating connector disconnect. In this case > > we need to reset the link parameters instead of continuing > > to use the fallback parameters since else this long pulse > > by the panel followed by a modeset request which was triggered by the u= serspace > > before getting the connector status as disconnected, will > > result into a modeset now using lower link rate/lane count values. > > = > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1385 > > Cc: Jani Nikula > > Cc: Ville Syrj=E4l=E4 > > Signed-off-by: Manasi Navare > > --- > > drivers/gpu/drm/i915/display/intel_dp.c | 28 +++++++++++++++++-------- > > 1 file changed, 19 insertions(+), 9 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/= i915/display/intel_dp.c > > index 55fda074c0ad..f7af372647dd 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > @@ -6111,6 +6111,18 @@ intel_dp_unset_edid(struct intel_dp *intel_dp) > > intel_dp->edid_quirks =3D 0; > > } > > = > > +static void > > +intel_dp_reset_link_params(struct intel_dp *intel_dp) > > +{ > > + /* Initial max link lane count */ > > + intel_dp->max_link_lane_count =3D intel_dp_max_common_lane_count(inte= l_dp); > > + > > + /* Initial max link rate */ > > + intel_dp->max_link_rate =3D intel_dp_max_common_rate(intel_dp); > > + > > + intel_dp->reset_link_params =3D false; > > +} > > + > > static int > > intel_dp_detect(struct drm_connector *connector, > > struct drm_modeset_acquire_ctx *ctx, > > @@ -6139,6 +6151,11 @@ intel_dp_detect(struct drm_connector *connector, > > memset(&intel_dp->compliance, 0, sizeof(intel_dp->compliance)); > > memset(intel_dp->dsc_dpcd, 0, sizeof(intel_dp->dsc_dpcd)); > > = > > + /*Reset the immutable VRR Capable property */ > > + drm_connector_set_vrr_capable_property(connector, > > + false); > > + intel_dp_reset_link_params(intel_dp); > > + > = > Why would we care what those are when the sink is disconnected? We are noticing this happen in case the panel send this long pulse indicati= ng status change to disconnected, while the modeset was already triggered by u= serspace in this case IGT, so the modeset continues right after i915_hotplug_work_fn so we need to reset all params which fixes the bug mentioned. Manasi > = > > if (intel_dp->is_mst) { > > drm_dbg_kms(&dev_priv->drm, > > "MST device may have disappeared %d vs %d\n", > > @@ -6152,15 +6169,8 @@ intel_dp_detect(struct drm_connector *connector, > > goto out; > > } > > = > > - if (intel_dp->reset_link_params) { > > - /* Initial max link lane count */ > > - intel_dp->max_link_lane_count =3D intel_dp_max_common_lane_count(int= el_dp); > > - > > - /* Initial max link rate */ > > - intel_dp->max_link_rate =3D intel_dp_max_common_rate(intel_dp); > > - > > - intel_dp->reset_link_params =3D false; > > - } > > + if (intel_dp->reset_link_params) > > + intel_dp_reset_link_params(intel_dp); > > = > > intel_dp_print_rates(intel_dp); > > = > > -- = > > 2.19.1 > = > -- = > Ville Syrj=E4l=E4 > Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx