From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: david.e.box@intel.com, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Tweaked Wa_14010685332 for all PCHs
Date: Thu, 25 Mar 2021 05:56:15 -0400 [thread overview]
Message-ID: <YFxePx9O6EMAlsWP@intel.com> (raw)
In-Reply-To: <20210325093213.20794-1-anshuman.gupta@intel.com>
On Thu, Mar 25, 2021 at 03:02:13PM +0530, Anshuman Gupta wrote:
> dispcnlunit1_cp_xosc_clkreq clock observed to be active on TGL-H platform
> despite Wa_14010685332 original sequence thus blocks entry to deeper s0ix state.
>
> The Tweaked Wa_14010685332 sequence fixes this issue, therefore use tweaked
> Wa_14010685332 sequence for every PCH since PCH_CNP.
>
> Fixes: b896898c7369 ("drm/i915: Tweaked Wa_14010685332 for PCHs used on gen11 platforms")
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
> .../drm/i915/display/intel_display_power.c | 18 +++++++++-------
> drivers/gpu/drm/i915/i915_irq.c | 21 -------------------
> 2 files changed, 10 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 7e0eaa872350..4e970be36487 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -5910,13 +5910,14 @@ void intel_display_power_suspend_late(struct drm_i915_private *i915)
> {
> if (INTEL_GEN(i915) >= 11 || IS_GEN9_LP(i915)) {
> bxt_enable_dc9(i915);
> - /* Tweaked Wa_14010685332:icp,jsp,mcc */
> - if (INTEL_PCH_TYPE(i915) >= PCH_ICP && INTEL_PCH_TYPE(i915) <= PCH_MCC)
> - intel_de_rmw(i915, SOUTH_CHICKEN1,
> - SBCLK_RUN_REFCLK_DIS, SBCLK_RUN_REFCLK_DIS);
> } else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) {
> hsw_enable_pc8(i915);
> }
> +
> + /* Tweaked Wa_14010685332:cnp,icp,jsp,mcc,tgp,rkl,adp */
why are you adding "rkl"?
I don't like mixing gpu with pch names...
> + if (INTEL_PCH_TYPE(i915) == PCH_CNP ||
> + (INTEL_PCH_TYPE(i915) >= PCH_ICP && INTEL_PCH_TYPE(i915) < PCH_DG1))
why can't we simply use
if (INTEL_PCH_TYPE(i915) >= PCH_CNP)
?
> + intel_de_rmw(i915, SOUTH_CHICKEN1, SBCLK_RUN_REFCLK_DIS, SBCLK_RUN_REFCLK_DIS);
> }
>
> void intel_display_power_resume_early(struct drm_i915_private *i915)
> @@ -5924,13 +5925,14 @@ void intel_display_power_resume_early(struct drm_i915_private *i915)
> if (INTEL_GEN(i915) >= 11 || IS_GEN9_LP(i915)) {
> gen9_sanitize_dc_state(i915);
> bxt_disable_dc9(i915);
> - /* Tweaked Wa_14010685332:icp,jsp,mcc */
> - if (INTEL_PCH_TYPE(i915) >= PCH_ICP && INTEL_PCH_TYPE(i915) <= PCH_MCC)
> - intel_de_rmw(i915, SOUTH_CHICKEN1, SBCLK_RUN_REFCLK_DIS, 0);
> -
> } else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) {
> hsw_disable_pc8(i915);
> }
> +
> + /* Tweaked Wa_14010685332:cnp,icp,jsp,mcc,tgp,rkl,adp */
> + if (INTEL_PCH_TYPE(i915) == PCH_CNP ||
> + (INTEL_PCH_TYPE(i915) >= PCH_ICP && INTEL_PCH_TYPE(i915) < PCH_DG1))
> + intel_de_rmw(i915, SOUTH_CHICKEN1, SBCLK_RUN_REFCLK_DIS, 0);
> }
>
> void intel_display_power_suspend(struct drm_i915_private *i915)
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 44aed4cbf894..8abcd35df926 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -3040,24 +3040,6 @@ static void valleyview_irq_reset(struct drm_i915_private *dev_priv)
> spin_unlock_irq(&dev_priv->irq_lock);
> }
>
> -static void cnp_display_clock_wa(struct drm_i915_private *dev_priv)
> -{
> - struct intel_uncore *uncore = &dev_priv->uncore;
> -
> - /*
> - * Wa_14010685332:cnp/cmp,tgp,adp
> - * TODO: Clarify which platforms this applies to
> - * TODO: Figure out if this workaround can be applied in the s0ix suspend/resume handlers as
> - * on earlier platforms and whether the workaround is also needed for runtime suspend/resume
> - */
> - if (INTEL_PCH_TYPE(dev_priv) == PCH_CNP ||
> - (INTEL_PCH_TYPE(dev_priv) >= PCH_TGP && INTEL_PCH_TYPE(dev_priv) < PCH_DG1)) {
> - intel_uncore_rmw(uncore, SOUTH_CHICKEN1, SBCLK_RUN_REFCLK_DIS,
> - SBCLK_RUN_REFCLK_DIS);
> - intel_uncore_rmw(uncore, SOUTH_CHICKEN1, SBCLK_RUN_REFCLK_DIS, 0);
> - }
> -}
> -
> static void gen8_irq_reset(struct drm_i915_private *dev_priv)
> {
> struct intel_uncore *uncore = &dev_priv->uncore;
> @@ -3082,7 +3064,6 @@ static void gen8_irq_reset(struct drm_i915_private *dev_priv)
> if (HAS_PCH_SPLIT(dev_priv))
> ibx_irq_reset(dev_priv);
>
> - cnp_display_clock_wa(dev_priv);
> }
>
> static void gen11_display_irq_reset(struct drm_i915_private *dev_priv)
> @@ -3123,8 +3104,6 @@ static void gen11_display_irq_reset(struct drm_i915_private *dev_priv)
>
> if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
> GEN3_IRQ_RESET(uncore, SDE);
> -
> - cnp_display_clock_wa(dev_priv);
> }
>
> static void gen11_irq_reset(struct drm_i915_private *dev_priv)
> --
> 2.26.2
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-03-25 9:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 9:32 [Intel-gfx] [PATCH] drm/i915: Tweaked Wa_14010685332 for all PCHs Anshuman Gupta
2021-03-25 9:56 ` Rodrigo Vivi [this message]
2021-03-25 12:09 ` [Intel-gfx] [PATCH v2] " Anshuman Gupta
2021-03-25 12:38 ` Rodrigo Vivi
2021-03-25 22:08 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Tweaked Wa_14010685332 for all PCHs (rev2) Patchwork
2021-03-25 22:12 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-03-25 22:38 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-03-26 3:48 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-07-08 7:27 ` [Intel-gfx] [v2] drm/i915: Tweaked Wa_14010685332 for all PCHs AceLan Kao
2021-07-12 7:09 ` [Intel-gfx] [REBASED v2] " Anshuman Gupta
2021-07-13 20:31 ` Box, David E
2021-07-14 7:55 ` Gupta, Anshuman
2021-08-05 11:49 ` [Intel-gfx] [CI " Anshuman Gupta
2021-07-12 7:35 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Tweaked Wa_14010685332 for all PCHs (rev3) Patchwork
2021-07-12 8:02 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-07-12 9:15 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-07-13 23:35 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Tweaked Wa_14010685332 for all PCHs (rev4) Patchwork
2021-07-14 9:30 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Tweaked Wa_14010685332 for all PCHs (rev5) Patchwork
2021-08-02 7:58 ` [Intel-gfx] [CI v2] drm/i915: Tweaked Wa_14010685332 for all PCHs Anshuman Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YFxePx9O6EMAlsWP@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=anshuman.gupta@intel.com \
--cc=david.e.box@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).