[Intel-gfx] [PATCH 8/9] drm/i915/ehl: ehl has only 36bit extended ppgtt support

[Chris Wilson]

Quoting Rodrigo Vivi (2019-03-13 21:11:43)
> From: Bob Paauwe <bob.j.paauwe at intel.com>
> 
> While EHL does support 4 level extended ppgtt, it only makes use
> of 36 bits instead of the 48 like the other platforms that have
> 4 level extended ppgtt.
> 
> Signed-off-by: Bob Paauwe <bob.j.paauwe at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem_gtt.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index dac08d9c3fab..584bb9898fed 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -1539,9 +1539,12 @@ static struct i915_hw_ppgtt *gen8_ppgtt_create(struct drm_i915_private *i915)
>         ppgtt->vm.i915 = i915;
>         ppgtt->vm.dma = &i915->drm.pdev->dev;
>  
> -       ppgtt->vm.total = HAS_FULL_48BIT_PPGTT(i915) ?
> -               1ULL << 48 :
> -               1ULL << 32;
> +       if (HAS_FULL_48BIT_PPGTT(i915))
> +               ppgtt->vm.total = IS_ELKHARTLAKE(i915) ?
> +                       1ULL << 36 :
> +                       1ULL << 48;
> +       else
> +               ppgtt->vm.total = 1ULL << 32;

At least write this as a if-else chain if you are not going to follow
through with the device-info patches.
-Chris