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

[Chris Wilson]

Quoting Oscar Mateo (2017-10-13 21:54:09)
> 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>
> ---
> diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
> index 63086ef..b309df3 100644
> --- a/drivers/gpu/drm/i915/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> @@ -898,6 +898,23 @@ static int glk_display_workarounds_init(struct drm_i915_private *dev_priv)
>         if (ret)
>                 return ret;
>  
> +       /*
> +        * WaDisablePWMClockGating:glk
> +        * Backlight PWM may stop in the asserted state, causing backlight
> +        * to stay fully on.
> +        */
> +       DISPLAY_WA_SET_BIT(GEN9_CLKGATE_DIS_0, PWM1_GATING_DIS | PWM2_GATING_DIS);
> +
> +       /* WaDDIIOTimeout:glk */
> +       if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1))
> +               DISPLAY_WA_CLR_BIT(CHICKEN_MISC_2, GLK_CL0_PWR_DOWN |
> +                                                  GLK_CL1_PWR_DOWN |
> +                                                  GLK_CL2_PWR_DOWN);
> +
> +       /* Display WA #1133: WaFbcSkipSegments:glk */
> +       DISPLAY_WA_SET_FIELD(ILK_DPFC_CHICKEN, GLK_SKIP_SEG_COUNT_MASK,
> +                            GLK_SKIP_SEG_EN | GLK_SKIP_SEG_COUNT(1));
> +

Random thought in passing, we are converging on REG_FIELD...

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