diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-01-19 19:26:58 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-01-21 10:32:27 +0000 |
| commit | 44a0ec0d3bd5ebbe2233b48cc53b5c79b66277b7 (patch) | |
| tree | 3dac5a68089709a8840acdc7d819e78eb35666bd /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | e0216b762a7096639db395a22bdda7d1a7213c0f (diff) | |
| download | op-kernel-dev-44a0ec0d3bd5ebbe2233b48cc53b5c79b66277b7.zip op-kernel-dev-44a0ec0d3bd5ebbe2233b48cc53b5c79b66277b7.tar.gz | |
drm/i915: Assert the drm_mm_node is allocated when on the VM lists
Before moving the vma between the VM active/inactive lists, assert that
the node is still allocated.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170119192659.31789-5-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_stolen.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_stolen.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 61cc0fc..127d698 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -702,6 +702,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv goto err_pages; } + GEM_BUG_ON(!drm_mm_node_allocated(&vma->node)); + vma->pages = obj->mm.pages; vma->flags |= I915_VMA_GLOBAL_BIND; __i915_vma_set_map_and_fenceable(vma); |
