drm/i915: Reject NEEDS_GTT relocations with full ppgtt

Doesn't make sense. Spotted while fixing an issue Chris
noticed in the same area.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index f5a1e0c34552242122b6d12bf3e7755e47b3318d..277485505bcabd09e4726ef5c97c10e75348274b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -128,6 +128,12 @@ eb_lookup_vmas(struct eb_vmas *eb,
                struct i915_vma *vma;
                struct i915_address_space *bind_vm = vm;
 
+               if (exec[i].flags & EXEC_OBJECT_NEEDS_GTT &&
+                   USES_FULL_PPGTT(vm->dev)) {
+                       ret = -EINVAL;
+                       goto out;
+               }
+
                /* If we have secure dispatch, or the userspace assures us that
                 * they know what they're doing, use the GGTT VM.
                 */