[Intel-gfx] [PATCH 08/22] drm/i915: Reduce WARN(i915_gem_valid_gtt_space) to a debug-only check

Joonas Lahtinen joonas.lahtinen at linux.intel.com
Thu Jul 28 09:18:47 UTC 2016


On ke, 2016-07-27 at 12:14 +0100, Chris Wilson wrote:
> i915_gem_valid_gtt_space() is used after inserting the VMA to double
> check the list - the location should have been chosen to pass all the
> restrictions.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_gem.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 2147225e7887..f47a9e450239 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -3095,10 +3095,7 @@ search_free:
>  			goto err_vma;
>  		}
>  	}
> -	if (WARN_ON(!i915_gem_valid_gtt_space(vma, obj->cache_level))) {
> -		ret = -EINVAL;
> -		goto err_remove_node;
> -	}
> +	GEM_BUG_ON(!i915_gem_valid_gtt_space(vma, obj->cache_level));
>  
>  	trace_i915_vma_bind(vma, flags);
>  	ret = i915_vma_bind(vma, obj->cache_level, flags);
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation


More information about the Intel-gfx mailing list