1 files changed, 65 insertions, 46 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index c55b1f75c980..d36a9755ad91 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3309,16 +3309,6 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv)
 
 static void nop_submit_request(struct i915_request *request)
 {
-        GEM_TRACE("%s fence %llx:%d -> -EIO\n",
-                  request->engine->name,
-                  request->fence.context, request->fence.seqno);
-        dma_fence_set_error(&request->fence, -EIO);
-
-        i915_request_submit(request);
-}
-
-static void nop_complete_submit_request(struct i915_request *request)
-{
         unsigned long flags;
 
         GEM_TRACE("%s fence %llx:%d -> -EIO\n",
@@ -3354,57 +3344,33 @@ void i915_gem_set_wedged(struct drm_i915_private *i915)
          * rolling the global seqno forward (since this would complete requests
          * for which we haven't set the fence error to EIO yet).
          */
-        for_each_engine(engine, i915, id) {
+        for_each_engine(engine, i915, id)
                 i915_gem_reset_prepare_engine(engine);
 
-                engine->submit_request = nop_submit_request;
-                engine->schedule = NULL;
-        }
-        i915->caps.scheduler = 0;
-
         /* Even if the GPU reset fails, it should still stop the engines */
         if (INTEL_GEN(i915) >= 5)
                 intel_gpu_reset(i915, ALL_ENGINES);
 
-        /*
-         * Make sure no one is running the old callback before we proceed with
-         * cancelling requests and resetting the completion tracking. Otherwise
-         * we might submit a request to the hardware which never completes.
-         */
-        synchronize_rcu();
-
         for_each_engine(engine, i915, id) {
-                /* Mark all executing requests as skipped */
-                engine->cancel_requests(engine);
-
-                /*
-                 * Only once we've force-cancelled all in-flight requests can we
-                 * start to complete all requests.
-                 */
-                engine->submit_request = nop_complete_submit_request;
+                engine->submit_request = nop_submit_request;
+                engine->schedule = NULL;
         }
+        i915->caps.scheduler = 0;
 
         /*
          * Make sure no request can slip through without getting completed by
          * either this call here to intel_engine_init_global_seqno, or the one
-         * in nop_complete_submit_request.
+         * in nop_submit_request.
          */
         synchronize_rcu();
 
-        for_each_engine(engine, i915, id) {
-                unsigned long flags;
-
-                /*
-                 * Mark all pending requests as complete so that any concurrent
-                 * (lockless) lookup doesn't try and wait upon the request as we
-                 * reset it.
-                 */
-                spin_lock_irqsave(&engine->timeline.lock, flags);
-                intel_engine_init_global_seqno(engine,
-                                               intel_engine_last_submit(engine));
-                spin_unlock_irqrestore(&engine->timeline.lock, flags);
+        /* Mark all executing requests as skipped */
+        for_each_engine(engine, i915, id)
+                engine->cancel_requests(engine);
 
+        for_each_engine(engine, i915, id) {
                 i915_gem_reset_finish_engine(engine);
+                intel_engine_wakeup(engine);
         }
 
 out:
@@ -5334,7 +5300,10 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)
                 I915_WRITE(MI_PREDICATE_RESULT_2, IS_HSW_GT3(dev_priv) ?
                            LOWER_SLICE_ENABLED : LOWER_SLICE_DISABLED);
 
-        intel_gt_workarounds_apply(dev_priv);
+        /* Apply the GT workarounds... */
+        intel_gt_apply_workarounds(dev_priv);
+        /* ...and determine whether they are sticking. */
+        intel_gt_verify_workarounds(dev_priv, "init");
 
         i915_gem_init_swizzling(dev_priv);
 
@@ -5529,6 +5498,44 @@ err_active:
         goto out_ctx;
 }
 
+static int
+i915_gem_init_scratch(struct drm_i915_private *i915, unsigned int size)
+{
+        struct drm_i915_gem_object *obj;
+        struct i915_vma *vma;
+        int ret;
+
+        obj = i915_gem_object_create_stolen(i915, size);
+        if (!obj)
+                obj = i915_gem_object_create_internal(i915, size);
+        if (IS_ERR(obj)) {
+                DRM_ERROR("Failed to allocate scratch page\n");
+                return PTR_ERR(obj);
+        }
+
+        vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);
+        if (IS_ERR(vma)) {
+                ret = PTR_ERR(vma);
+                goto err_unref;
+        }
+
+        ret = i915_vma_pin(vma, 0, 0, PIN_GLOBAL | PIN_HIGH);
+        if (ret)
+                goto err_unref;
+
+        i915->gt.scratch = vma;
+        return 0;
+
+err_unref:
+        i915_gem_object_put(obj);
+        return ret;
+}
+
+static void i915_gem_fini_scratch(struct drm_i915_private *i915)
+{
+        i915_vma_unpin_and_release(&i915->gt.scratch, 0);
+}
+
 int i915_gem_init(struct drm_i915_private *dev_priv)
 {
         int ret;
@@ -5575,12 +5582,19 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
                 goto err_unlock;
         }
 
-        ret = i915_gem_contexts_init(dev_priv);
+        ret = i915_gem_init_scratch(dev_priv,
+                                    IS_GEN2(dev_priv) ? SZ_256K : PAGE_SIZE);
         if (ret) {
                 GEM_BUG_ON(ret == -EIO);
                 goto err_ggtt;
         }
 
+        ret = i915_gem_contexts_init(dev_priv);
+        if (ret) {
+                GEM_BUG_ON(ret == -EIO);
+                goto err_scratch;
+        }
+
         ret = intel_engines_init(dev_priv);
         if (ret) {
                 GEM_BUG_ON(ret == -EIO);
@@ -5653,6 +5667,8 @@ err_pm:
 err_context:
         if (ret != -EIO)
                 i915_gem_contexts_fini(dev_priv);
+err_scratch:
+        i915_gem_fini_scratch(dev_priv);
 err_ggtt:
 err_unlock:
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
@@ -5704,8 +5720,11 @@ void i915_gem_fini(struct drm_i915_private *dev_priv)
         intel_uc_fini(dev_priv);
         i915_gem_cleanup_engines(dev_priv);
         i915_gem_contexts_fini(dev_priv);
+        i915_gem_fini_scratch(dev_priv);
         mutex_unlock(&dev_priv->drm.struct_mutex);
 
+        intel_wa_list_free(&dev_priv->gt_wa_list);
+
         intel_cleanup_gt_powersave(dev_priv);
 
         intel_uc_fini_misc(dev_priv);