drm/i915: Introduce a preempt context

Add another perma-pinned context for using for preemption at any time.
We cannot just reuse the existing kernel context, as first and foremost
we need to ensure that we can preempt the kernel context itself, so
require a distinct context id. Similar to the kernel context, we may
want to interrupt execution and switch to the preempt context at any
time, and so it needs to be permanently pinned and available.

To compensate for yet another permanent allocation, we shrink the
existing context and the new context by reducing their ringbuffer to the
minimum.

v2: Assert that we never allocate a request from the preemption context.
v3: Limit perma-pin to engines that may preempt.
v4: Onion cleanup for early driver death
v5: Onion ordering in main driver cleanup as well.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171003203453.15692-4-chris@chris-wilson.co.uk

1 files changed, 20 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index dd64e3d13aa9..8b8053d8e24b 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -613,9 +613,22 @@ int intel_engine_init_common(struct intel_engine_cs *engine)
         if (IS_ERR(ring))
                 return PTR_ERR(ring);
 
+        /*
+         * Similarly the preempt context must always be available so that
+         * we can interrupt the engine at any time.
+         */
+        if (INTEL_INFO(engine->i915)->has_logical_ring_preemption) {
+                ring = engine->context_pin(engine,
+                                           engine->i915->preempt_context);
+                if (IS_ERR(ring)) {
+                        ret = PTR_ERR(ring);
+                        goto err_unpin_kernel;
+                }
+        }
+
         ret = intel_engine_init_breadcrumbs(engine);
         if (ret)
-                goto err_unpin;
+                goto err_unpin_preempt;
 
         ret = i915_gem_render_state_init(engine);
         if (ret)
@@ -634,7 +647,10 @@ err_rs_fini:
         i915_gem_render_state_fini(engine);
 err_breadcrumbs:
         intel_engine_fini_breadcrumbs(engine);
-err_unpin:
+err_unpin_preempt:
+        if (INTEL_INFO(engine->i915)->has_logical_ring_preemption)
+                engine->context_unpin(engine, engine->i915->preempt_context);
+err_unpin_kernel:
         engine->context_unpin(engine, engine->i915->kernel_context);
         return ret;
 }
@@ -660,6 +676,8 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine)
         intel_engine_cleanup_cmd_parser(engine);
         i915_gem_batch_pool_fini(&engine->batch_pool);
 
+        if (INTEL_INFO(engine->i915)->has_logical_ring_preemption)
+                engine->context_unpin(engine, engine->i915->preempt_context);
         engine->context_unpin(engine, engine->i915->kernel_context);
 }