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

[Chris Wilson]

Quoting Oscar Mateo (2017-10-13 21:54:12)
> 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          | 15 +--------------
>  drivers/gpu/drm/i915/intel_workarounds.c |  6 ++++++
>  2 files changed, 7 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 85e3424..e1b00c9 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -8404,17 +8404,6 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,
>         I915_WRITE(GEN7_MISCCPCTL, misccpctl);
>  }
>  
> -static void skl_init_clock_gating(struct drm_i915_private *dev_priv)
> -{
> -       /* WAC6entrylatency:skl */
> -       I915_WRITE(FBC_LLC_READ_CTRL, I915_READ(FBC_LLC_READ_CTRL) |
> -                  FBC_LLC_FULLY_OPEN);
> -
> -       /* WaFbcNukeOnHostModify:skl */
> -       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 0ef2f46..f48c10e 100644
> --- a/drivers/gpu/drm/i915/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> @@ -871,6 +871,12 @@ static int skl_display_workarounds_init(struct drm_i915_private *dev_priv)
>         /* WaDisableDopClockGating */
>         DISPLAY_WA_CLR_BIT(GEN7_MISCCPCTL, GEN7_DOP_CLOCK_GATE_ENABLE);
>  
> +       /* WAC6entrylatency:skl */
> +       DISPLAY_WA_SET_BIT(FBC_LLC_READ_CTRL, FBC_LLC_FULLY_OPEN);
> +
> +       /* WaFbcNukeOnHostModify:skl */
> +       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