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 81AFCC2BA2B for ; Tue, 7 Apr 2020 15:14:20 +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 59C3C2074F for ; Tue, 7 Apr 2020 15:14:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59C3C2074F 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 E06C46E0AC; Tue, 7 Apr 2020 15:14:19 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 166DB6E0AC for ; Tue, 7 Apr 2020 15:14:19 +0000 (UTC) IronPort-SDR: UL7/zt1z0SKo1psY1gEZLvFdqePdBsxBmnx4pTEt34WzowOrDeTKnko8guEhbp6W2ncBGeZw3P VuAzRrciumNg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2020 08:14:09 -0700 IronPort-SDR: I3O9/Hl9JS3Nd/lyYRyvrdEVF/3yWfR+Hv5VSOp804AweolT9qCQNeFBBPe8Er4m2GPMgpjJ30 6KfSeRq5MyUw== X-IronPort-AV: E=Sophos;i="5.72,355,1580803200"; d="scan'208";a="275128612" Received: from ideak-desk.fi.intel.com ([10.237.72.183]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2020 08:14:07 -0700 Date: Tue, 7 Apr 2020 18:13:57 +0300 From: Imre Deak To: =?iso-8859-1?Q?Jos=E9?= Roberto de Souza Message-ID: <20200407151357.GA21484@ideak-desk.fi.intel.com> References: <20200407011157.362092-1-jose.souza@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200407011157.362092-1-jose.souza@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH v2 1/8] drm/i915/display: Move out code to return the digital_port of the aux ch 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: You-Sheng Yang , 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 Mon, Apr 06, 2020 at 06:11:50PM -0700, Jos=E9 Roberto de Souza wrote: > Moving the code to return the digital port of the aux channel also > removing the intel_phy_is_tc() to make it generic. > digital_port will be needed in icl_tc_phy_aux_power_well_enable() > so adding it as a parameter to icl_tc_port_assert_ref_held(). > = > While at at removing the duplicated call to icl_tc_phy_aux_ch() in > icl_tc_port_assert_ref_held(). > = > v2: > - fixed build when DRM_I915_DEBUG_RUNTIME_PM is not set > - moved to before hsw_wait_for_power_well_enable() as it will be > needed by hsw_wait_for_power_well_enable() in a future patch > = > Cc: You-Sheng Yang > Signed-off-by: Jos=E9 Roberto de Souza > --- > .../drm/i915/display/intel_display_power.c | 69 ++++++++++--------- > 1 file changed, 37 insertions(+), 32 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers= /gpu/drm/i915/display/intel_display_power.c > index 433e5a81dd4d..f2f42b5960df 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -282,6 +282,33 @@ static void hsw_power_well_pre_disable(struct drm_i9= 15_private *dev_priv, > gen8_irq_power_well_pre_disable(dev_priv, irq_pipe_mask); > } > = > +static struct intel_digital_port * > +aux_ch_to_digital_port(struct drm_i915_private *dev_priv, > + enum aux_ch aux_ch) > +{ > + struct intel_digital_port *dig_port =3D NULL; > + struct intel_encoder *encoder; > + > + for_each_intel_encoder(&dev_priv->drm, encoder) { > + /* We'll check the MST primary port */ > + if (encoder->type =3D=3D INTEL_OUTPUT_DP_MST) > + continue; > + > + dig_port =3D enc_to_dig_port(encoder); > + if (drm_WARN_ON(&dev_priv->drm, !dig_port)) This would not work on non-digital port encoders (DSI), so just if (!dig_port) With that fixed: Reviewed-by: Imre Deak > + continue; > + > + if (dig_port->aux_ch !=3D aux_ch) { > + dig_port =3D NULL; > + continue; > + } > + > + break; > + } > + > + return dig_port; > +} > + > static void hsw_wait_for_power_well_enable(struct drm_i915_private *dev_= priv, > struct i915_power_well *power_well) > { > @@ -501,41 +528,14 @@ static int power_well_async_ref_count(struct drm_i9= 15_private *dev_priv, > } > = > static void icl_tc_port_assert_ref_held(struct drm_i915_private *dev_pri= v, > - struct i915_power_well *power_well) > + struct i915_power_well *power_well, > + struct intel_digital_port *dig_port) > { > - enum aux_ch aux_ch =3D icl_tc_phy_aux_ch(dev_priv, power_well); > - struct intel_digital_port *dig_port =3D NULL; > - struct intel_encoder *encoder; > - > /* Bypass the check if all references are released asynchronously */ > if (power_well_async_ref_count(dev_priv, power_well) =3D=3D > power_well->count) > return; > = > - aux_ch =3D icl_tc_phy_aux_ch(dev_priv, power_well); > - > - for_each_intel_encoder(&dev_priv->drm, encoder) { > - enum phy phy =3D intel_port_to_phy(dev_priv, encoder->port); > - > - if (!intel_phy_is_tc(dev_priv, phy)) > - continue; > - > - /* We'll check the MST primary port */ > - if (encoder->type =3D=3D INTEL_OUTPUT_DP_MST) > - continue; > - > - dig_port =3D enc_to_dig_port(encoder); > - if (drm_WARN_ON(&dev_priv->drm, !dig_port)) > - continue; > - > - if (dig_port->aux_ch !=3D aux_ch) { > - dig_port =3D NULL; > - continue; > - } > - > - break; > - } > - > if (drm_WARN_ON(&dev_priv->drm, !dig_port)) > return; > = > @@ -545,7 +545,8 @@ static void icl_tc_port_assert_ref_held(struct drm_i9= 15_private *dev_priv, > #else > = > static void icl_tc_port_assert_ref_held(struct drm_i915_private *dev_pri= v, > - struct i915_power_well *power_well) > + struct i915_power_well *power_well, > + struct intel_digital_port *dig_port) > { > } > = > @@ -558,9 +559,10 @@ icl_tc_phy_aux_power_well_enable(struct drm_i915_pri= vate *dev_priv, > struct i915_power_well *power_well) > { > enum aux_ch aux_ch =3D icl_tc_phy_aux_ch(dev_priv, power_well); > + struct intel_digital_port *dig_port =3D aux_ch_to_digital_port(dev_priv= , aux_ch); > u32 val; > = > - icl_tc_port_assert_ref_held(dev_priv, power_well); > + icl_tc_port_assert_ref_held(dev_priv, power_well, dig_port); > = > val =3D intel_de_read(dev_priv, DP_AUX_CH_CTL(aux_ch)); > val &=3D ~DP_AUX_CH_CTL_TBT_IO; > @@ -588,7 +590,10 @@ static void > icl_tc_phy_aux_power_well_disable(struct drm_i915_private *dev_priv, > struct i915_power_well *power_well) > { > - icl_tc_port_assert_ref_held(dev_priv, power_well); > + enum aux_ch aux_ch =3D icl_tc_phy_aux_ch(dev_priv, power_well); > + struct intel_digital_port *dig_port =3D aux_ch_to_digital_port(dev_priv= , aux_ch); > + > + icl_tc_port_assert_ref_held(dev_priv, power_well, dig_port); > = > hsw_power_well_disable(dev_priv, power_well); > } > -- = > 2.26.0 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx