[Intel-gfx] [PATCH 06/11] drm/i915/tgl: Wa_1409420604

[Chris Wilson]

Quoting Mika Kuoppala (2019-10-15 16:44:44)
> Avoid possible hang in CPSS unit.
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/gt/intel_workarounds.c | 5 +++++
>  drivers/gpu/drm/i915/i915_reg.h             | 3 +++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index db7844daace9..b7d7fdc5ba90 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -897,6 +897,11 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
>  static void
>  tgl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
>  {
> +       /* Wa_1409420604:tgl */
> +       if (IS_TGL_REVID(i915, TGL_REVID_A0, TGL_REVID_A0))
> +               wa_write_or(wal,
> +                           SUBSLICE_UNIT_LEVEL_CLKGATE2,
> +                           CPSSUNIT_CLKGATE_DIS);
>  }
>  
>  static void
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 781ca18cb45b..51c3e7975d6b 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -4054,6 +4054,9 @@ enum {
>  #define SUBSLICE_UNIT_LEVEL_CLKGATE    _MMIO(0x9524)
>  #define  GWUNIT_CLKGATE_DIS            (1 << 16)
>  
> +#define SUBSLICE_UNIT_LEVEL_CLKGATE2   _MMIO(0x9528)
> +#define  CPSSUNIT_CLKGATE_DIS          (1 << 9)

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