drm/i915: Request PIN_GLOBAL when pinning a vma for GTT relocations
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 31 Oct 2014 13:53:53 +0000 (13:53 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 7 Nov 2014 17:42:00 +0000 (18:42 +0100)
commitc826c4493851913e57dd47a7fbfe07156ac9f91d
tree45d16973cbcd0a2317279f7b65a359ef6d915d12
parentef79e17ccef32599f3cec3842f81d70117181291
drm/i915: Request PIN_GLOBAL when pinning a vma for GTT relocations

Always require PIN_GLOBAL when we want a mappable offset (PIN_MAPPABLE).
This causes the pin to fixup the global binding in cases were the vma
was already bound (and due to the proceeding bug, we considered it to be
already mappable).

References: https://bugs.freedesktop.org/show_bug.cgi?id=85671
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
[danvet: Add WARN_ON to check that PIN_MAP implies PIN_GLOBAL as
discussed on irc.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c