[Intel-gfx] [PATCH] drm/i915: Reserve shadow batch VMA analogue to others

[Daniel Vetter]

On Wed, Jan 07, 2015 at 05:32:39PM +0000, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> 
> If not pinned VMA can become an eviction target just before it needs to be
> executed which breaks the internal object lifetime rules.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87399

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

> ---
>  drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index 1d6e092..e3ef177 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -1081,6 +1081,7 @@ i915_gem_execbuffer_parse(struct intel_engine_cs *ring,
>  {
>  	struct drm_i915_private *dev_priv = to_i915(batch_obj->base.dev);
>  	struct drm_i915_gem_object *shadow_batch_obj;
> +	bool need_reloc = false;
>  	int ret;
>  
>  	shadow_batch_obj = i915_gem_batch_pool_get(&dev_priv->mm.batch_pool,
> @@ -1106,6 +1107,7 @@ i915_gem_execbuffer_parse(struct intel_engine_cs *ring,
>  		vma->exec_entry = shadow_exec_entry;
>  		vma->exec_entry->flags = __EXEC_OBJECT_PURGEABLE;
>  		drm_gem_object_reference(&shadow_batch_obj->base);
> +		i915_gem_execbuffer_reserve_vma(vma, ring, &need_reloc);
>  		list_add_tail(&vma->exec_list, &eb->vmas);
>  
>  		shadow_batch_obj->base.pending_read_domains =
> -- 
> 2.2.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch