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.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 B9A2FC433E1 for ; Fri, 15 May 2020 16:21:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 926732076A for ; Fri, 15 May 2020 16:21:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726170AbgEOQVL (ORCPT ); Fri, 15 May 2020 12:21:11 -0400 Received: from mga07.intel.com ([134.134.136.100]:20078 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726168AbgEOQVK (ORCPT ); Fri, 15 May 2020 12:21:10 -0400 IronPort-SDR: dn9g2uCryqs1UNVjKd11IK/SDEnsic6q2IpI3Jk3CY6I2+wXsOEAQw5nCvN3x5gRaIbqKBI02X c5hw7kyIqyCg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2020 09:21:10 -0700 IronPort-SDR: yWlc2JpfAU5yjlnpbMcfC912tnHbvl4HDAJvZzGQZB+QHSAa4z+B+C0XiRtFcj9CpFYLak1ZNA d6yj4Vge+W0Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,395,1583222400"; d="scan'208";a="307461969" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by FMSMGA003.fm.intel.com with SMTP; 15 May 2020 09:21:07 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 15 May 2020 19:21:06 +0300 Date: Fri, 15 May 2020 19:21:06 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Imre Deak Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix AUX power domain toggling across TypeC mode resets Message-ID: <20200515162106.GL6112@intel.com> References: <20200514204553.27193-1-imre.deak@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200514204553.27193-1-imre.deak@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, May 14, 2020 at 11:45:53PM +0300, Imre Deak wrote: > Make sure to select the port's AUX power domain while holding the TC > port lock. The domain depends on the port's current TC mode, which may > get changed under us if we're not holding the lock. Can we toss in a lockdep assert? Did this by any chance help with the MST issues you were seeing? > > This was left out from > commit 8c10e2262663 ("drm/i915: Keep the TypeC port mode fixed for detect/AUX transfers") > > Cc: # v5.4+ > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/display/intel_dp.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 408c3c1c5e81..40d42dcff0b7 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -1359,8 +1359,7 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > bool is_tc_port = intel_phy_is_tc(i915, phy); > i915_reg_t ch_ctl, ch_data[5]; > u32 aux_clock_divider; > - enum intel_display_power_domain aux_domain = > - intel_aux_power_domain(intel_dig_port); > + enum intel_display_power_domain aux_domain; > intel_wakeref_t aux_wakeref; > intel_wakeref_t pps_wakeref; > int i, ret, recv_bytes; > @@ -1375,6 +1374,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > if (is_tc_port) > intel_tc_port_lock(intel_dig_port); > > + aux_domain = intel_aux_power_domain(intel_dig_port); > + > aux_wakeref = intel_display_power_get(i915, aux_domain); > pps_wakeref = pps_lock(intel_dp); > > -- > 2.23.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel 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.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 BCEDCC433DF for ; Fri, 15 May 2020 16:21:11 +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 95DF6206D8 for ; Fri, 15 May 2020 16:21:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95DF6206D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 1EF826ECF0; Fri, 15 May 2020 16:21:11 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id C37BE6ECEB for ; Fri, 15 May 2020 16:21:09 +0000 (UTC) IronPort-SDR: XD7JaMGvBX1H+Z6qc7/XvtEFSHRYacs41/is3mfeMKsgDlE6Fl/Ki5csRYqdZ3Er6omC0b66JQ NNOgSskwpPjw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2020 09:21:09 -0700 IronPort-SDR: yWlc2JpfAU5yjlnpbMcfC912tnHbvl4HDAJvZzGQZB+QHSAa4z+B+C0XiRtFcj9CpFYLak1ZNA d6yj4Vge+W0Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,395,1583222400"; d="scan'208";a="307461969" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by FMSMGA003.fm.intel.com with SMTP; 15 May 2020 09:21:07 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 15 May 2020 19:21:06 +0300 Date: Fri, 15 May 2020 19:21:06 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Imre Deak Message-ID: <20200515162106.GL6112@intel.com> References: <20200514204553.27193-1-imre.deak@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200514204553.27193-1-imre.deak@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix AUX power domain toggling across TypeC mode resets 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, stable@vger.kernel.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, May 14, 2020 at 11:45:53PM +0300, Imre Deak wrote: > Make sure to select the port's AUX power domain while holding the TC > port lock. The domain depends on the port's current TC mode, which may > get changed under us if we're not holding the lock. Can we toss in a lockdep assert? Did this by any chance help with the MST issues you were seeing? > = > This was left out from > commit 8c10e2262663 ("drm/i915: Keep the TypeC port mode fixed for detect= /AUX transfers") > = > Cc: # v5.4+ > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/display/intel_dp.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i9= 15/display/intel_dp.c > index 408c3c1c5e81..40d42dcff0b7 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -1359,8 +1359,7 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > bool is_tc_port =3D intel_phy_is_tc(i915, phy); > i915_reg_t ch_ctl, ch_data[5]; > u32 aux_clock_divider; > - enum intel_display_power_domain aux_domain =3D > - intel_aux_power_domain(intel_dig_port); > + enum intel_display_power_domain aux_domain; > intel_wakeref_t aux_wakeref; > intel_wakeref_t pps_wakeref; > int i, ret, recv_bytes; > @@ -1375,6 +1374,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > if (is_tc_port) > intel_tc_port_lock(intel_dig_port); > = > + aux_domain =3D intel_aux_power_domain(intel_dig_port); > + > aux_wakeref =3D intel_display_power_get(i915, aux_domain); > pps_wakeref =3D pps_lock(intel_dp); > = > -- = > 2.23.1 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx