]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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>
Tue, 20 Aug 2013 12:20:50 +0000 (14:20 +0200)
commiteaa8240f2c62646ec324a9d4d3d029e6609f12e0
tree33ce8660a9e910c91a6b6f50d82a85b25ee52b2b
parent9a597daae04b76882ec0ef91918907a8832598e1
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