[Intel-gfx] [PATCH 13/49] drm/i915/bxt: add bxt_init_clock_gating

[Nick Hoath]

On 17/03/2015 09:39, Imre Deak wrote:
> Signed-off-by: Imre Deak <imre.deak at intel.com>
> ---
>   drivers/gpu/drm/i915/intel_pm.c | 12 +++++++++++-
>   1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index b89ab4d..3d4a7c3 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -94,6 +94,11 @@ static void skl_init_clock_gating(struct drm_device *dev)
>   			   GEN8_LQSC_RO_PERF_DIS);
>   }
>
> +static void bxt_init_clock_gating(struct drm_device *dev)
> +{
> +	gen9_init_clock_gating(dev);
> +}
> +
>   static void i915_pineview_get_mem_freq(struct drm_device *dev)
>   {
>   	struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -6503,7 +6508,12 @@ void intel_init_pm(struct drm_device *dev)
>   	if (INTEL_INFO(dev)->gen >= 9) {
>   		skl_setup_wm_latency(dev);
>
> -		dev_priv->display.init_clock_gating = skl_init_clock_gating;
> +		if (IS_BROXTON(dev))
> +			dev_priv->display.init_clock_gating =
> +				bxt_init_clock_gating;
> +		else
> +			dev_priv->display.init_clock_gating =
> +				skl_init_clock_gating;

This doesn't match the style in: "HardWare WorkAround ring 
initialisation for Broxton", where we explicitly check the IS_BROXTON 
and IS_SKYLAKE state.

>   		dev_priv->display.update_wm = skl_update_wm;
>   		dev_priv->display.update_sprite_wm = skl_update_sprite_wm;
>   	} else if (HAS_PCH_SPLIT(dev)) {
>