[Intel-gfx] [PATCH 12/18] drm/i915/skl: Implement WaDisablePowerCompilerClockGating

[Nick Hoath]

On 09/02/2015 19:33, Damien Lespiau wrote:
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_reg.h         | 5 +++--
>   drivers/gpu/drm/i915/intel_ringbuffer.c | 8 ++++++++
>   2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index a457c28..fdfbdb3 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -5241,8 +5241,9 @@ enum skl_disp_power_wells {
>   #define COMMON_SLICE_CHICKEN2			0x7014
>   # define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE	(1<<0)
>
> -#define HIZ_CHICKEN				0x7018
> -# define CHV_HZ_8X8_MODE_IN_1X			(1<<15)
> +#define HIZ_CHICKEN					0x7018
> +# define CHV_HZ_8X8_MODE_IN_1X				(1<<15)
> +# define BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE	(1<<3)
>
>   #define GEN9_SLICE_COMMON_ECO_CHICKEN0		0x7308
>   #define  DISABLE_PIXEL_MASK_CAMMING		(1<<14)
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 27d101c..3135192 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -930,8 +930,16 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)
>
>   static int skl_init_workarounds(struct intel_engine_cs *ring)
>   {
> +	struct drm_device *dev = ring->dev;
> +	struct drm_i915_private *dev_priv = dev->dev_private;
> +
>   	gen9_init_workarounds(ring);
>
> +	/* WaDisablePowerCompilerClockGating:skl */
> +	if (INTEL_REVID(dev) == SKL_REVID_B0)

Should this be <= ?

> +		WA_SET_BIT_MASKED(HIZ_CHICKEN,
> +				  BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE);
> +
>   	return 0;
>   }
>
>