Commit a20ab592 authored by Chris Wilson's avatar Chris Wilson

drm/i915/execlists: Set priority hint prior to submission

Since we now run process_csb() outside of the engine->active.lock, we
can process a CS-event immediately upon our ELSP write. As we currently
inspect the pending queue *after* the ELSP write, there is an
opportunity for a CS-event to update the pending queue before we can
read it, making ourselves chases an invalid pointer.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111427
Fixes: df403069 ("drm/i915/execlists: Lift process_csb() out of the irq-off spinlock")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190821142336.21609-1-chris@chris-wilson.co.uk
parent 6846895f
...@@ -1335,9 +1335,9 @@ static void execlists_dequeue(struct intel_engine_cs *engine) ...@@ -1335,9 +1335,9 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
if (submit) { if (submit) {
*port = execlists_schedule_in(last, port - execlists->pending); *port = execlists_schedule_in(last, port - execlists->pending);
memset(port + 1, 0, (last_port - port) * sizeof(*port)); memset(port + 1, 0, (last_port - port) * sizeof(*port));
execlists_submit_ports(engine);
execlists->switch_priority_hint = execlists->switch_priority_hint =
switch_prio(engine, *execlists->pending); switch_prio(engine, *execlists->pending);
execlists_submit_ports(engine);
} else { } else {
ring_set_paused(engine, 0); ring_set_paused(engine, 0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment