[Intel-gfx] [PATCH] drm/i915: Move vm page allocation in proper place

[Daniel Vetter]

On Fri, Apr 10, 2015 at 03:54:58PM +0300, Mika Kuoppala wrote:
> Move to i915_vma_bind as it is part of the binding.
> 
> Suggested-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Michel Thierry <michel.thierry at intel.com>
> Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_gem.c     | 11 -----------
>  drivers/gpu/drm/i915/i915_gem_gtt.c | 16 +++++++++++++++-
>  2 files changed, 15 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 9fbc355..c1dbdc4 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -3550,17 +3550,6 @@ search_free:
>  	if (ret)
>  		goto err_remove_node;
>  
> -	/*  allocate before insert / bind */
> -	if (vma->vm->allocate_va_range) {
> -		trace_i915_va_alloc(vma->vm, vma->node.start, vma->node.size,
> -				VM_TO_TRACE_NAME(vma->vm));
> -		ret = vma->vm->allocate_va_range(vma->vm,
> -						vma->node.start,
> -						vma->node.size);
> -		if (ret)
> -			goto err_remove_node;
> -	}
> -
>  	trace_i915_vma_bind(vma, flags);
>  	ret = i915_vma_bind(vma, obj->cache_level,
>  			    flags & PIN_GLOBAL ? GLOBAL_BIND : 0);
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 19f84c5..4517de7 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -2936,8 +2936,22 @@ i915_get_ggtt_vma_pages(struct i915_vma *vma)
>  int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level,
>  		  u32 flags)
>  {
> +	int ret;
> +
> +	if (vma->vm->allocate_va_range) {
> +		trace_i915_va_alloc(vma->vm, vma->node.start,
> +				    vma->node.size,
> +				    VM_TO_TRACE_NAME(vma->vm));
> +
> +		ret = vma->vm->allocate_va_range(vma->vm,
> +						 vma->node.start,
> +						 vma->node.size);
> +		if (ret)
> +			return ret;
> +	}
> +
>  	if (i915_is_ggtt(vma->vm)) {
> -		int ret = i915_get_ggtt_vma_pages(vma);
> +		ret = i915_get_ggtt_vma_pages(vma);
>  
>  		if (ret)
>  			return ret;
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch