drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gem / i915_gem_execbuffer.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 201fed1..cb86574 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -290,7 +290,6 @@ struct i915_execbuffer {
        struct intel_context *reloc_context;
 
        u64 invalid_flags; /** Set of execobj.flags that are invalid */
-       u32 context_flags; /** Set of execobj.flags to insert from the ctx */
 
        u64 batch_len; /** Length of batch within object */
        u32 batch_start_offset; /** Location within object of batch */
@@ -541,9 +540,6 @@ eb_validate_vma(struct i915_execbuffer *eb,
                        entry->flags |= EXEC_OBJECT_NEEDS_GTT | __EXEC_OBJECT_NEEDS_MAP;
        }
 
-       if (!(entry->flags & EXEC_OBJECT_PINNED))
-               entry->flags |= eb->context_flags;
-
        return 0;
 }
 
@@ -750,10 +746,6 @@ static int eb_select_context(struct i915_execbuffer *eb)
        if (rcu_access_pointer(ctx->vm))
                eb->invalid_flags |= EXEC_OBJECT_NEEDS_GTT;
 
-       eb->context_flags = 0;
-       if (test_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags))
-               eb->context_flags |= __EXEC_OBJECT_NEEDS_BIAS;
-
        return 0;
 }
 
@@ -922,21 +914,38 @@ err:
        return err;
 }
 
-static int eb_validate_vmas(struct i915_execbuffer *eb)
+static int eb_lock_vmas(struct i915_execbuffer *eb)
 {
        unsigned int i;
        int err;
 
-       INIT_LIST_HEAD(&eb->unbound);
-
        for (i = 0; i < eb->buffer_count; i++) {
-               struct drm_i915_gem_exec_object2 *entry = &eb->exec[i];
                struct eb_vma *ev = &eb->vma[i];
                struct i915_vma *vma = ev->vma;
 
                err = i915_gem_object_lock(vma->obj, &eb->ww);
                if (err)
                        return err;
+       }
+
+       return 0;
+}
+
+static int eb_validate_vmas(struct i915_execbuffer *eb)
+{
+       unsigned int i;
+       int err;
+
+       INIT_LIST_HEAD(&eb->unbound);
+
+       err = eb_lock_vmas(eb);
+       if (err)
+               return err;
+
+       for (i = 0; i < eb->buffer_count; i++) {
+               struct drm_i915_gem_exec_object2 *entry = &eb->exec[i];
+               struct eb_vma *ev = &eb->vma[i];
+               struct i915_vma *vma = ev->vma;
 
                err = eb_pin_vma(eb, entry, ev);
                if (err == -EDEADLK)
@@ -2054,9 +2063,7 @@ repeat_validate:
 
        list_for_each_entry(ev, &eb->relocs, reloc_link) {
                if (!have_copy) {
-                       pagefault_disable();
                        err = eb_relocate_vma(eb, ev);
-                       pagefault_enable();
                        if (err)
                                break;
                } else {