Attachment 138910 Details for Bug 105873 – backported fixed patch

[patch] backported fixed patch

0001-drm-i915-Remove-vma-from-object-on-destroy-not-close.patch (text/plain), 2.77 KB, created by Owen Zhang on 2018-04-19 01:40:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Zhang

Created: 2018-04-19 01:40:24 UTC

Size: 2.77 KB

patch

obsolete

>From b050e685044221099ed88748bfb6853a53c3d479 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 6 Dec 2017 12:49:13 +0000
>Subject: [PATCH] drm/i915: Remove vma from object on destroy, not close
>
>Originally we translated from the object to the vma by walking
>obj->vma_list to find the matching vm (for user lookups). Now we process
>user lookups using the rbtree, and we only use obj->vma_list itself for
>maintaining state (e.g. ensuring that all vma are flushed or rebound).
>As such maintenance needs to go on beyond the user's awareness of the
>vma, defer removal of the vma from the obj->vma_list from i915_vma_close()
>to i915_vma_destroy()
>
>Fixes: 5888fc9eac3c ("drm/i915: Flush pending GTT writes before unbinding")
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104155
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>Link: https://patchwork.freedesktop.org/patch/msgid/20171206124914.19960-1-chris@chris-wilson.co.uk
>Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>---
> drivers/gpu/drm/i915/i915_gem.c | 3 ++-
> drivers/gpu/drm/i915/i915_vma.c | 4 +++-
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index eea63dd..af6758b 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -3746,7 +3746,8 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,
> 			return -EBUSY;
> 		}
> 
>-		if (i915_gem_valid_gtt_space(vma, cache_level))
>+		if (!i915_vma_is_closed(vma) &&
>+		    i915_gem_valid_gtt_space(vma, cache_level))
> 			continue;
> 
> 		ret = i915_vma_unbind(vma);
>diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
>index bf6d8d1..1013403 100644
>--- a/drivers/gpu/drm/i915/i915_vma.c
>+++ b/drivers/gpu/drm/i915/i915_vma.c
>@@ -466,6 +466,7 @@ i915_vma_insert(struct i915_vma *vma, u64 size, u64 alignment, u64 flags)
> 	u64 start, end;
> 	int ret;
> 
>+	GEM_BUG_ON(i915_vma_is_closed(vma));
> 	GEM_BUG_ON(vma->flags & (I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND));
> 	GEM_BUG_ON(drm_mm_node_allocated(&vma->node));
> 
>@@ -678,7 +679,9 @@ static void i915_vma_destroy(struct i915_vma *vma)
> 		GEM_BUG_ON(i915_gem_active_isset(&vma->last_read[i]));
> 	GEM_BUG_ON(i915_gem_active_isset(&vma->last_fence));
> 
>+	list_del(&vma->obj_link);
> 	list_del(&vma->vm_link);
>+
> 	if (!i915_vma_is_ggtt(vma))
> 		i915_ppgtt_put(i915_vm_to_ppgtt(vma->vm));
> 
>@@ -690,7 +693,6 @@ void i915_vma_close(struct i915_vma *vma)
> 	GEM_BUG_ON(i915_vma_is_closed(vma));
> 	vma->flags |= I915_VMA_CLOSED;
> 
>-	list_del(&vma->obj_link);
> 	rb_erase(&vma->obj_node, &vma->obj->vma_tree);
> 
> 	if (!i915_vma_is_active(vma) && !i915_vma_is_pinned(vma))
>-- 
>2.7.3
>

Actions: View | Splinter Review

Attachments on bug 105873: 138562 | 138910 | 138911 | 138916 | 138917

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.