[Intel-gfx] [PATCH v3 16/22] drm/i915/kbl: Move GT and Display workarounds from init_clock_gating

[Chris Wilson]

Quoting Oscar Mateo (2017-10-13 21:54:10)
> To their rightful place inside intel_workarounds.c
> 
> Signed-off-by: Oscar Mateo <oscar.mateo at intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c          | 21 +--------------------
>  drivers/gpu/drm/i915/intel_workarounds.c | 11 +++++++++++
>  2 files changed, 12 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index edbadb9..6b621e5 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -8425,23 +8425,6 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,
>         I915_WRITE(GEN7_MISCCPCTL, misccpctl);
>  }
>  
> -static void kbl_init_clock_gating(struct drm_i915_private *dev_priv)
> -{
> -       /* WaDisableSDEUnitClockGating:kbl */
> -       if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0))
> -               I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) |
> -                          GEN8_SDEUNIT_CLOCK_GATE_DISABLE);
> -
> -       /* WaDisableGamClockGating:kbl */
> -       if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0))
> -               I915_WRITE(GEN6_UCGCTL1, I915_READ(GEN6_UCGCTL1) |
> -                          GEN6_GAMUNIT_CLOCK_GATE_DISABLE);
> -
> -       /* WaFbcNukeOnHostModify:kbl */
> -       I915_WRITE(ILK_DPFC_CHICKEN, I915_READ(ILK_DPFC_CHICKEN) |
> -                  ILK_DPFC_NUKE_ON_ANY_MODIFICATION);
> -}
> diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
> index b309df3..d2a968a 100644
> --- a/drivers/gpu/drm/i915/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> @@ -889,6 +889,17 @@ static int kbl_display_workarounds_init(struct drm_i915_private *dev_priv)
>         if (ret)
>                 return ret;
>  
> +       /* WaDisableSDEUnitClockGating:kbl */
> +       if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0))
> +               DISPLAY_WA_SET_BIT(GEN8_UCGCTL6, GEN8_SDEUNIT_CLOCK_GATE_DISABLE);
> +
> +       /* WaDisableGamClockGating:kbl */
> +       if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0))
> +               DISPLAY_WA_SET_BIT(GEN6_UCGCTL1, GEN6_GAMUNIT_CLOCK_GATE_DISABLE);
> +
> +       /* WaFbcNukeOnHostModify:kbl */
> +       DISPLAY_WA_SET_BIT(ILK_DPFC_CHICKEN, ILK_DPFC_NUKE_ON_ANY_MODIFICATION);
> +
>         return 0;

Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris