openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Add vma to list at creation 

With the current code there shouldn't be a distinction - however with an
upcoming change we intend to allocate a vma much earlier, before it's
actually bound anywhere.

To do this we have to check node allocation as well for the _bound()
check.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
[danvet: move list_del(&vma->vma_link) from vma_unbind to vma_destroy,
again fallout from the loss of "rm/i915: Cleanup more of VMA in
destroy".]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

fixup for drm/i915: Add vma to list at creation
This commit is contained in:
Ben Widawsky 2013-07-31 17:00:16 -07:00 committed by Daniel Vetter
parent 95f5301dd8
commit 8b9c2b9411
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/i915/i915_gem.c
View File

@ -2642,7 +2642,6 @@ int i915_vma_unbind(struct i915_vma *vma)
if (i915_is_ggtt(vma->vm)) if (i915_is_ggtt(vma->vm))
obj->map_and_fenceable = true; obj->map_and_fenceable = true;
list_del(&vma->vma_link);
drm_mm_remove_node(&vma->node); drm_mm_remove_node(&vma->node);
i915_gem_vma_destroy(vma); i915_gem_vma_destroy(vma);
@ -3186,12 +3185,6 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,
list_move_tail(&obj->global_list, &dev_priv->mm.bound_list); list_move_tail(&obj->global_list, &dev_priv->mm.bound_list);
list_add_tail(&vma->mm_list, &vm->inactive_list); list_add_tail(&vma->mm_list, &vm->inactive_list);
/* Keep GGTT vmas first to make debug easier */
if (i915_is_ggtt(vm))
list_add(&vma->vma_link, &obj->vma_list);
else
list_add_tail(&vma->vma_link, &obj->vma_list);
fenceable = fenceable =
i915_is_ggtt(vm) && i915_is_ggtt(vm) &&
i915_gem_obj_ggtt_size(obj) == fence_size && i915_gem_obj_ggtt_size(obj) == fence_size &&
@ -4074,12 +4067,19 @@ struct i915_vma *i915_gem_vma_create(struct drm_i915_gem_object *obj,
vma->vm = vm; vma->vm = vm;
vma->obj = obj; vma->obj = obj;
/* Keep GGTT vmas first to make debug easier */
if (i915_is_ggtt(vm))
list_add(&vma->vma_link, &obj->vma_list);
else
list_add_tail(&vma->vma_link, &obj->vma_list);
return vma; return vma;
} }
void i915_gem_vma_destroy(struct i915_vma *vma) void i915_gem_vma_destroy(struct i915_vma *vma)
{ {
WARN_ON(vma->node.allocated); WARN_ON(vma->node.allocated);
list_del(&vma->vma_link);
kfree(vma); kfree(vma);
} }
@ -4767,7 +4767,7 @@ bool i915_gem_obj_bound(struct drm_i915_gem_object *o,
struct i915_vma *vma; struct i915_vma *vma;
list_for_each_entry(vma, &o->vma_list, vma_link) list_for_each_entry(vma, &o->vma_list, vma_link)
if (vma->vm == vm) if (vma->vm == vm && drm_mm_node_allocated(&vma->node))
return true; return true;
return false; return false;