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 2971435..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 */
@@ -500,7 +499,7 @@ eb_validate_vma(struct i915_execbuffer *eb,
         * also covers all platforms with local memory.
         */
        if (entry->relocation_count &&
-           INTEL_GEN(eb->i915) >= 12 && !IS_TIGERLAKE(eb->i915))
+           GRAPHICS_VER(eb->i915) >= 12 && !IS_TIGERLAKE(eb->i915))
                return -EINVAL;
 
        if (unlikely(entry->flags & eb->invalid_flags))
@@ -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)
@@ -994,7 +1003,7 @@ eb_get_vma(const struct i915_execbuffer *eb, unsigned long handle)
        }
 }
 
-static void eb_release_vmas(struct i915_execbuffer *eb, bool final, bool release_userptr)
+static void eb_release_vmas(struct i915_execbuffer *eb, bool final)
 {
        const unsigned int count = eb->buffer_count;
        unsigned int i;
@@ -1008,11 +1017,6 @@ static void eb_release_vmas(struct i915_execbuffer *eb, bool final, bool release
 
                eb_unreserve_vma(ev);
 
-               if (release_userptr && ev->flags & __EXEC_OBJECT_USERPTR_INIT) {
-                       ev->flags &= ~__EXEC_OBJECT_USERPTR_INIT;
-                       i915_gem_object_userptr_submit_fini(vma->obj);
-               }
-
                if (final)
                        i915_vma_put(vma);
        }
@@ -1439,7 +1443,7 @@ err_pool:
 
 static bool reloc_can_use_engine(const struct intel_engine_cs *engine)
 {
-       return engine->class != VIDEO_DECODE_CLASS || !IS_GEN(engine->i915, 6);
+       return engine->class != VIDEO_DECODE_CLASS || GRAPHICS_VER(engine->i915) != 6;
 }
 
 static u32 *reloc_gpu(struct i915_execbuffer *eb,
@@ -1481,7 +1485,7 @@ static inline bool use_reloc_gpu(struct i915_vma *vma)
        if (DBG_FORCE_RELOC)
                return false;
 
-       return !dma_resv_test_signaled_rcu(vma->resv, true);
+       return !dma_resv_test_signaled(vma->resv, true);
 }
 
 static unsigned long vma_phys_addr(struct i915_vma *vma, u32 offset)
@@ -1671,7 +1675,7 @@ eb_relocate_entry(struct i915_execbuffer *eb,
                 * batchbuffers.
                 */
                if (reloc->write_domain == I915_GEM_DOMAIN_INSTRUCTION &&
-                   IS_GEN(eb->i915, 6)) {
+                   GRAPHICS_VER(eb->i915) == 6) {
                        err = i915_vma_bind(target->vma,
                                            target->vma->obj->cache_level,
                                            PIN_GLOBAL, NULL);
@@ -1990,7 +1994,7 @@ repeat:
        }
 
        /* We may process another execbuffer during the unlock... */
-       eb_release_vmas(eb, false, true);
+       eb_release_vmas(eb, false);
        i915_gem_ww_ctx_fini(&eb->ww);
 
        if (rq) {
@@ -2059,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 {
@@ -2094,7 +2096,7 @@ repeat_validate:
 
 err:
        if (err == -EDEADLK) {
-               eb_release_vmas(eb, false, false);
+               eb_release_vmas(eb, false);
                err = i915_gem_ww_ctx_backoff(&eb->ww);
                if (!err)
                        goto repeat_validate;
@@ -2191,7 +2193,7 @@ retry:
 
 err:
        if (err == -EDEADLK) {
-               eb_release_vmas(eb, false, false);
+               eb_release_vmas(eb, false);
                err = i915_gem_ww_ctx_backoff(&eb->ww);
                if (!err)
                        goto retry;
@@ -2268,7 +2270,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb)
 
 #ifdef CONFIG_MMU_NOTIFIER
        if (!err && (eb->args->flags & __EXEC_USERPTR_USED)) {
-               spin_lock(&eb->i915->mm.notifier_lock);
+               read_lock(&eb->i915->mm.notifier_lock);
 
                /*
                 * count is always at least 1, otherwise __EXEC_USERPTR_USED
@@ -2286,7 +2288,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb)
                                break;
                }
 
-               spin_unlock(&eb->i915->mm.notifier_lock);
+               read_unlock(&eb->i915->mm.notifier_lock);
        }
 #endif
 
@@ -2332,7 +2334,7 @@ static int i915_reset_gen7_sol_offsets(struct i915_request *rq)
        u32 *cs;
        int i;
 
-       if (!IS_GEN(rq->engine->i915, 7) || rq->engine->id != RCS0) {
+       if (GRAPHICS_VER(rq->engine->i915) != 7 || rq->engine->id != RCS0) {
                drm_dbg(&rq->engine->i915->drm, "sol reset is gen7/rcs only\n");
                return -EINVAL;
        }
@@ -3375,7 +3377,7 @@ i915_gem_do_execbuffer(struct drm_device *dev,
 
        eb.batch_flags = 0;
        if (args->flags & I915_EXEC_SECURE) {
-               if (INTEL_GEN(i915) >= 11)
+               if (GRAPHICS_VER(i915) >= 11)
                        return -ENODEV;
 
                /* Return -EPERM to trigger fallback code on old binaries. */
@@ -3435,7 +3437,7 @@ i915_gem_do_execbuffer(struct drm_device *dev,
 
        err = eb_lookup_vmas(&eb);
        if (err) {
-               eb_release_vmas(&eb, true, true);
+               eb_release_vmas(&eb, true);
                goto err_engine;
        }
 
@@ -3528,7 +3530,7 @@ err_request:
        i915_request_put(eb.request);
 
 err_vma:
-       eb_release_vmas(&eb, true, true);
+       eb_release_vmas(&eb, true);
        if (eb.trampoline)
                i915_vma_unpin(eb.trampoline);
        WARN_ON(err == -EDEADLK);