[Intel-gfx] [PATCH] drm/i915: Drop expectations of VM_IO from our GGTT mmappings

[Abdiel Janulgue]

On 07/08/2019 12.41, Chris Wilson wrote:
> We don't really want to use VM_IO for our GGTT mmaps (it implies that
> the mmap contains memory mapped registers, which we do not expose) yet I
> overzealously added it to an assert just because that's how we always
> had setup the vma.

Reviewed-by: Abdiel Janulgue <abdiel.janulgue at linux.intel.com>

> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Abdiel Janulgue <abdiel.janulgue at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_mm.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_mm.c b/drivers/gpu/drm/i915/i915_mm.c
> index c23bb29e6d3e..318562ce64c0 100644
> --- a/drivers/gpu/drm/i915/i915_mm.c
> +++ b/drivers/gpu/drm/i915/i915_mm.c
> @@ -63,9 +63,8 @@ int remap_io_mapping(struct vm_area_struct *vma,
>  	struct remap_pfn r;
>  	int err;
>  
> -	GEM_BUG_ON((vma->vm_flags &
> -		    (VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP)) !=
> -		   (VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP));
> +#define EXPECTED_FLAGS (VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP)
> +	GEM_BUG_ON((vma->vm_flags & EXPECTED_FLAGS) != EXPECTED_FLAGS);
>  
>  	/* We rely on prevalidation of the io-mapping to skip track_pfn(). */
>  	r.mm = vma->vm_mm;
>