drm/i915: Only disable execlist preemption for the duration of the request

We need to prevent resubmission of the context immediately following an
initial resubmit (which does a lite-restore preemption). Currently we do
this by disabling all submission whilst the context is still active, but
we can improve this by limiting the restriction to only until we
receive notification from the context-switch interrupt that the
lite-restore preemption is complete.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170124110009.28947-2-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index fa69d72fdcb9ff45e6590402bb59b9b325d65c38..9d7a77ecec3d98eed9f9c766ac4c070faaf3ec83 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3320,15 +3320,21 @@ static int i915_engine_info(struct seq_file *m, void *unused)
 
                        rcu_read_lock();
                        rq = READ_ONCE(engine->execlist_port[0].request);
-                       if (rq)
-                               print_request(m, rq, "\t\tELSP[0] ");
-                       else
+                       if (rq) {
+                               seq_printf(m, "\t\tELSP[0] count=%d, ",
+                                          engine->execlist_port[0].count);
+                               print_request(m, rq, "rq: ");
+                       } else {
                                seq_printf(m, "\t\tELSP[0] idle\n");
+                       }
                        rq = READ_ONCE(engine->execlist_port[1].request);
-                       if (rq)
-                               print_request(m, rq, "\t\tELSP[1] ");
-                       else
+                       if (rq) {
+                               seq_printf(m, "\t\tELSP[1] count=%d, ",
+                                          engine->execlist_port[1].count);
+                               print_request(m, rq, "rq: ");
+                       } else {
                                seq_printf(m, "\t\tELSP[1] idle\n");
+                       }
                        rcu_read_unlock();
 
                        spin_lock_irq(&engine->timeline->lock);

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 9dd612a2df162de10b27d0df6dee567b93714cef..9896027880ea8a3195659a7461be9681acde21d3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -380,7 +380,7 @@ static void execlists_submit_ports(struct intel_engine_cs *engine)
                execlists_context_status_change(port[0].request,
                                                INTEL_CONTEXT_SCHEDULE_IN);
        desc[0] = execlists_update_context(port[0].request);
-       engine->preempt_wa = port[0].count++; /* bdw only? fixed on skl? */
+       port[0].count++;
 
        if (port[1].request) {
                GEM_BUG_ON(port[1].count);
@@ -545,15 +545,11 @@ bool intel_execlists_idle(struct drm_i915_private *dev_priv)
        return true;
 }
 
-static bool execlists_elsp_ready(struct intel_engine_cs *engine)
+static bool execlists_elsp_ready(const struct intel_engine_cs *engine)
 {
-       int port;
+       const struct execlist_port *port = engine->execlist_port;
 
-       port = 1; /* wait for a free slot */
-       if (engine->preempt_wa)
-               port = 0; /* wait for GPU to be idle before continuing */
-
-       return !engine->execlist_port[port].request;
+       return port[0].count + port[1].count < 2;
 }
 
 /*
@@ -601,8 +597,6 @@ static void intel_lrc_irq_handler(unsigned long data)
                                i915_gem_request_put(port[0].request);
                                port[0] = port[1];
                                memset(&port[1], 0, sizeof(port[1]));
-
-                               engine->preempt_wa = false;
                        }
 
                        GEM_BUG_ON(port[0].count == 0 &&

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 9183d148b36a5f511efa8087c2e60f8b4568e300..dbd32585f27a64f43576742ba6c9d22fb8555876 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -380,7 +380,6 @@ struct intel_engine_cs {
        struct rb_root execlist_queue;
        struct rb_node *execlist_first;
        unsigned int fw_domains;
-       bool preempt_wa;
        u32 ctx_desc_template;
 
        /* Contexts are pinned whilst they are active on the GPU. The last