Commit d081e021 authored by Chris Wilson's avatar Chris Wilson

drm/i915/execlists: Remove too early assert

We can't assert that the execlists are active before we set the flag. So
perform the assert after we are expected to have marked the execlists
active.

Fixes: 339ccd35 ("drm/i915: Assert that we always complete a submission to guc/execlists")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Acked-by: default avatarTomi Sarvela <tomi.p.sarvela@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180216153210.30551-1-chris@chris-wilson.co.uk
parent 339ccd35
...@@ -644,8 +644,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine) ...@@ -644,8 +644,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
port_assign(port, last); port_assign(port, last);
/* We must always keep the beast fed if we have work piled up */ /* We must always keep the beast fed if we have work piled up */
GEM_BUG_ON(port_isset(execlists->port) &&
!execlists_is_active(execlists, EXECLISTS_ACTIVE_USER));
GEM_BUG_ON(execlists->first && !port_isset(execlists->port)); GEM_BUG_ON(execlists->first && !port_isset(execlists->port));
unlock: unlock:
...@@ -655,6 +653,9 @@ static void execlists_dequeue(struct intel_engine_cs *engine) ...@@ -655,6 +653,9 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
execlists_set_active(execlists, EXECLISTS_ACTIVE_USER); execlists_set_active(execlists, EXECLISTS_ACTIVE_USER);
execlists_submit_ports(engine); execlists_submit_ports(engine);
} }
GEM_BUG_ON(port_isset(execlists->port) &&
!execlists_is_active(execlists, EXECLISTS_ACTIVE_USER));
} }
void void
......
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