diff options
| author | Chris Wilson <[email protected]> | 2017-01-15 17:27:40 +0000 |
|---|---|---|
| committer | Chris Wilson <[email protected]> | 2017-01-16 12:21:20 +0000 |
| commit | 9734ad13c2321e8efc1fab4665d40d88e947c560 (patch) | |
| tree | 9f388ce1a9920c270ee8ed35315a3ca4baec7caa | |
| parent | 3fec7ec4450fee2f18fe20088209193999d8ff94 (diff) | |
drm/i915: Assert we do not attempt to reuse an allocated node
i915_gem_gtt_reserve() and i915_gem_gtt_insert() can only work on
unallocated nodes. Check that the callers complies.
Signed-off-by: Chris Wilson <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Joonas Lahtinen <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 786229137f91..64f241bffc80 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -3627,6 +3627,7 @@ int i915_gem_gtt_reserve(struct i915_address_space *vm, GEM_BUG_ON(!IS_ALIGNED(offset, I915_GTT_MIN_ALIGNMENT)); GEM_BUG_ON(range_overflows(offset, size, vm->total)); GEM_BUG_ON(vm == &vm->i915->mm.aliasing_ppgtt->base); + GEM_BUG_ON(drm_mm_node_allocated(node)); node->size = size; node->start = offset; @@ -3720,6 +3721,7 @@ int i915_gem_gtt_insert(struct i915_address_space *vm, GEM_BUG_ON(start > 0 && !IS_ALIGNED(start, I915_GTT_PAGE_SIZE)); GEM_BUG_ON(end < U64_MAX && !IS_ALIGNED(end, I915_GTT_PAGE_SIZE)); GEM_BUG_ON(vm == &vm->i915->mm.aliasing_ppgtt->base); + GEM_BUG_ON(drm_mm_node_allocated(node)); if (unlikely(range_overflows(start, size, end))) return -ENOSPC; |