[Intel-gfx] [PATCH 3/3] drm/i915: Simplify gem stolen initialization.

[Ander Conselvan De Oliveira]

On Sun, 2016-12-18 at 13:36 -0800, Rodrigo Vivi wrote:
> Let's take usage of IS_LP to simplify the gem stolen
> initialization as suggest by Tvrtko.
> 
> Also assume that all new LP platforms follows the chv+
> and others bdw+.
> 
> Broxton and Geminilake were probably using the incorrect path
> so far.

This patch doesn't change the path for bxt or glk, they will still use
chv_get_stolen_reserved(), which is correct. It does make things clearer though,
so with the above note removed, you can apply

Reviewed-by: Ander Conselvan de Oliveira <conselvan2 at gmail.com>

to the whole series.

Ander

> 
> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
> Cc: Imre Deak <imre.deak at intel.com>
> Cc: Mika Kuoppala <mika.kuoppala at intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem_stolen.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c
> b/drivers/gpu/drm/i915/i915_gem_stolen.c
> index 3d24227..98deaa7 100644
> --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
> +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
> @@ -454,13 +454,12 @@ int i915_gem_init_stolen(struct drm_i915_private
> *dev_priv)
>  					 &reserved_size);
>  		break;
>  	default:
> -		if (IS_BROADWELL(dev_priv) ||
> -		    IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
> -			bdw_get_stolen_reserved(dev_priv, &reserved_base,
> +		if (IS_LP(dev_priv))
> +			chv_get_stolen_reserved(dev_priv, &reserved_base,
>  						&reserved_size);
>  		else
> -			chv_get_stolen_reserved(dev_priv, &reserved_base,
> -						 &reserved_size);
> +			bdw_get_stolen_reserved(dev_priv, &reserved_base,
> +						&reserved_size);
>  		break;
>  	}
>