diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-01-11 21:09:26 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-01-13 16:35:27 +0000 |
| commit | 0325701a34f96ecc2502228d07f046d479b8d328 (patch) | |
| tree | b7d21c8699a0c446975e0ed0a9b425913ccf7c05 /drivers/gpu/drm/i915/i915_vma.c | |
| parent | 0c7eeda1af05693fbecd021eeab37477aa49c162 (diff) | |
| download | op-kernel-dev-0325701a34f96ecc2502228d07f046d479b8d328.zip op-kernel-dev-0325701a34f96ecc2502228d07f046d479b8d328.tar.gz | |
drm/i915: Assert that we have allocated the drm_mm_node upon pinning
We currently check after the slow path that the vma is bound correctly,
but we don't currently check after the fast path. This is important in
case we accidentally take the fast path and leave the vma misplaced.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170111210937.29252-27-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_vma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index b74eeb7..379364b 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -476,6 +476,7 @@ int __i915_vma_do_pin(struct i915_vma *vma, if ((bound ^ vma->flags) & I915_VMA_GLOBAL_BIND) __i915_vma_set_map_and_fenceable(vma); + GEM_BUG_ON(!drm_mm_node_allocated(&vma->node)); GEM_BUG_ON(i915_vma_misplaced(vma, size, alignment, flags)); return 0; |
