drm/i915: prepare bind_to_vm for preallocated vma
authorBen Widawsky <ben@bwidawsk.net>
Wed, 14 Aug 2013 09:38:35 +0000 (11:38 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 22 Aug 2013 11:31:53 +0000 (13:31 +0200)
commitaccfef2e5a8f713bfa0c06696b5e10754686dc72
tree95c48d0b04366d1bcd35d269a464f7bf99b1ec03
parent82a55ad1a0585e4e01a47f72fe81fb5a2d2c0fb1
drm/i915: prepare bind_to_vm for preallocated vma

In the new execbuf code we want to track buffers using the vmas even
before they're all properly mapped. Which means that bind_to_vm needs
to deal with buffers which have preallocated vmas which aren't yet
bound.

This patch implements this prep work and adjusts our WARN/BUG checks.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
[danvet: Split out from Ben's big execbuf patch. Also move one BUG
back to its original place to deflate the diff a notch.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c