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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE 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 CF79FC48BCD for ; Wed, 9 Jun 2021 11:42:12 +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 950FE61364 for ; Wed, 9 Jun 2021 11:42:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 950FE61364 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 3C05989E15; Wed, 9 Jun 2021 11:42:10 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4603E89E15 for ; Wed, 9 Jun 2021 11:42:09 +0000 (UTC) IronPort-SDR: 1I9QX5wTeaD9cvomKWsvQa6/aaekzH+PpiDNtWobO54lfpENstNhXxzJmogRbaRZb39jKfw6QA OrcqV3kPzkdA== X-IronPort-AV: E=McAfee;i="6200,9189,10009"; a="204867061" X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="204867061" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 04:42:08 -0700 IronPort-SDR: qDUwN65R5A/ieZl9Sao5dAd8clZwF78gE+f2eFYHMe314VLVmYCgbuwptZSxEY8DaxZZgssant JvMRGqvCwhKQ== X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="482351160" Received: from ochaldek-mobl.ger.corp.intel.com (HELO localhost) ([10.252.34.111]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 04:42:07 -0700 From: Jani Nikula To: Imre Deak , intel-gfx@lists.freedesktop.org In-Reply-To: <20210526143729.2563672-3-imre.deak@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210526143729.2563672-1-imre.deak@intel.com> <20210526143729.2563672-3-imre.deak@intel.com> Date: Wed, 09 Jun 2021 14:42:04 +0300 Message-ID: <87y2bjz2lv.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 3/3] drm/i915/adlp: Fix AUX power well -> PHY mapping 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 26 May 2021, Imre Deak wrote: > On ADL_P the power well->PHY mapping doesn't follow the mapping on previous > platforms, fix this up. > > While at it remove the redundant dev_priv param from > icl_tc_phy_aux_ch(). > > Signed-off-by: Imre Deak > --- > .../drm/i915/display/intel_display_power.c | 34 ++++++++++--------- > 1 file changed, 18 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c > index a95bbf23e6b7c..7ddd63114b36b 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -291,8 +291,7 @@ static void hsw_power_well_pre_disable(struct drm_i915_private *dev_priv, > #define ICL_TBT_AUX_PW_TO_CH(pw_idx) \ > ((pw_idx) - ICL_PW_CTL_IDX_AUX_TBT1 + AUX_CH_C) > > -static enum aux_ch icl_tc_phy_aux_ch(struct drm_i915_private *dev_priv, > - struct i915_power_well *power_well) > +static enum aux_ch icl_aux_pw_to_ch(const struct i915_power_well *power_well) > { > int pw_idx = power_well->desc->hsw.idx; > > @@ -327,6 +326,15 @@ aux_ch_to_digital_port(struct drm_i915_private *dev_priv, > return dig_port; > } > > +static enum phy icl_aux_pw_to_phy(struct drm_i915_private *i915, > + const struct i915_power_well *power_well) > +{ > + enum aux_ch aux_ch = icl_aux_pw_to_ch(power_well); > + struct intel_digital_port *dig_port = aux_ch_to_digital_port(i915, aux_ch); Replying to an already merged patch... aux_ch_to_digital_port() may return NULL but we don't really check this anywhere. Any thoughts how this should be handled? BR, Jani. > + > + return intel_port_to_phy(i915, dig_port->base.port); > +} > + > static void hsw_wait_for_power_well_enable(struct drm_i915_private *dev_priv, > struct i915_power_well *power_well, > bool timeout_expected) > @@ -468,15 +476,13 @@ static void hsw_power_well_disable(struct drm_i915_private *dev_priv, > hsw_wait_for_power_well_disable(dev_priv, power_well); > } > > -#define ICL_AUX_PW_TO_PHY(pw_idx) ((pw_idx) - ICL_PW_CTL_IDX_AUX_A) > - > static void > icl_combo_phy_aux_power_well_enable(struct drm_i915_private *dev_priv, > struct i915_power_well *power_well) > { > const struct i915_power_well_regs *regs = power_well->desc->hsw.regs; > int pw_idx = power_well->desc->hsw.idx; > - enum phy phy = ICL_AUX_PW_TO_PHY(pw_idx); > + enum phy phy = icl_aux_pw_to_phy(dev_priv, power_well); > u32 val; > > drm_WARN_ON(&dev_priv->drm, !IS_ICELAKE(dev_priv)); > @@ -508,7 +514,7 @@ icl_combo_phy_aux_power_well_disable(struct drm_i915_private *dev_priv, > { > const struct i915_power_well_regs *regs = power_well->desc->hsw.regs; > int pw_idx = power_well->desc->hsw.idx; > - enum phy phy = ICL_AUX_PW_TO_PHY(pw_idx); > + enum phy phy = icl_aux_pw_to_phy(dev_priv, power_well); > u32 val; > > drm_WARN_ON(&dev_priv->drm, !IS_ICELAKE(dev_priv)); > @@ -595,7 +601,7 @@ static void > icl_tc_phy_aux_power_well_enable(struct drm_i915_private *dev_priv, > struct i915_power_well *power_well) > { > - enum aux_ch aux_ch = icl_tc_phy_aux_ch(dev_priv, power_well); > + enum aux_ch aux_ch = icl_aux_pw_to_ch(power_well); > struct intel_digital_port *dig_port = aux_ch_to_digital_port(dev_priv, aux_ch); > const struct i915_power_well_regs *regs = power_well->desc->hsw.regs; > bool is_tbt = power_well->desc->hsw.is_tc_tbt; > @@ -643,7 +649,7 @@ static void > icl_tc_phy_aux_power_well_disable(struct drm_i915_private *dev_priv, > struct i915_power_well *power_well) > { > - enum aux_ch aux_ch = icl_tc_phy_aux_ch(dev_priv, power_well); > + enum aux_ch aux_ch = icl_aux_pw_to_ch(power_well); > struct intel_digital_port *dig_port = aux_ch_to_digital_port(dev_priv, aux_ch); > > icl_tc_port_assert_ref_held(dev_priv, power_well, dig_port); > @@ -655,11 +661,9 @@ static void > icl_aux_power_well_enable(struct drm_i915_private *dev_priv, > struct i915_power_well *power_well) > { > - int pw_idx = power_well->desc->hsw.idx; > - enum phy phy = ICL_AUX_PW_TO_PHY(pw_idx); /* non-TBT only */ > - bool is_tbt = power_well->desc->hsw.is_tc_tbt; > + enum phy phy = icl_aux_pw_to_phy(dev_priv, power_well); > > - if (is_tbt || intel_phy_is_tc(dev_priv, phy)) > + if (intel_phy_is_tc(dev_priv, phy)) > return icl_tc_phy_aux_power_well_enable(dev_priv, power_well); > else if (IS_ICELAKE(dev_priv)) > return icl_combo_phy_aux_power_well_enable(dev_priv, > @@ -672,11 +676,9 @@ static void > icl_aux_power_well_disable(struct drm_i915_private *dev_priv, > struct i915_power_well *power_well) > { > - int pw_idx = power_well->desc->hsw.idx; > - enum phy phy = ICL_AUX_PW_TO_PHY(pw_idx); /* non-TBT only */ > - bool is_tbt = power_well->desc->hsw.is_tc_tbt; > + enum phy phy = icl_aux_pw_to_phy(dev_priv, power_well); > > - if (is_tbt || intel_phy_is_tc(dev_priv, phy)) > + if (intel_phy_is_tc(dev_priv, phy)) > return icl_tc_phy_aux_power_well_disable(dev_priv, power_well); > else if (IS_ICELAKE(dev_priv)) > return icl_combo_phy_aux_power_well_disable(dev_priv, -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx