[Intel-gfx] [PATCH 6/8] drm/i915: Make vlv and chv forcewake put generic.

[Deepak S]

On Monday 08 December 2014 11:57 PM, Mika Kuoppala wrote:
> These two were using a fw dance logic where posting read was done
> after both domain bit were set. When in other gens, the posting
> read is done immediately after setting the forcewake bit for each
> domain.
>
> Now bring these in line with other gens.
>
> Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com>
> ---
>   drivers/gpu/drm/i915/intel_uncore.c | 16 +++++-----------
>   1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index e883790..8021bec 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -232,16 +232,6 @@ static int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv)
>   	return ret;
>   }
>   
> -static void __vlv_force_wake_put(struct drm_i915_private *dev_priv,
> -				 int fw_engine)
> -{
> -	fw_domains_put(dev_priv, fw_engine);
> -	fw_domains_posting_read(dev_priv);
> -
> -	if (!IS_CHERRYVIEW(dev_priv->dev))
> -		gen6_gt_check_fifodbg(dev_priv);
> -}
> -
>   static void gen6_force_wake_timer(unsigned long arg)
>   {
>   	struct intel_uncore_forcewake_domain *domain = (void *)arg;
> @@ -958,7 +948,11 @@ void intel_uncore_init(struct drm_device *dev)
>   			       FORCEWAKE_MEDIA_GEN9, FORCEWAKE_ACK_MEDIA_GEN9);
>   	} else if (IS_VALLEYVIEW(dev)) {
>   		dev_priv->uncore.funcs.force_wake_get = fw_domains_get;
> -		dev_priv->uncore.funcs.force_wake_put = __vlv_force_wake_put;
> +		if (!IS_CHERRYVIEW(dev))
> +			dev_priv->uncore.funcs.force_wake_put =
> +				fw_domains_put_with_fifo;
> +		else
> +			dev_priv->uncore.funcs.force_wake_put = fw_domains_put;
>   		fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,
>   			       FORCEWAKE_VLV, FORCEWAKE_ACK_VLV);
>   		fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA,
>
Looks fine
Reviewed-by: Deepak S<deepak.s at linux.intel.com>