]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/i915/execlists: Remove too early assert
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 16 Feb 2018 15:32:10 +0000 (15:32 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 16 Feb 2018 16:18:32 +0000 (16:18 +0000)
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: 339ccd35b42c ("drm/i915: Assert that we always complete a submission to guc/execlists")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: MichaƂ Winiarski <michal.winiarski@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Acked-by: Tomi Sarvela <tomi.p.sarvela@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180216153210.30551-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/intel_lrc.c

index 6fbe1a8a37add6dd1ef00cfb4fbdaac07fb7ccfc..9b6d781b22ec10c5adcce18de19613c97dfbb07f 100644 (file)
@@ -644,8 +644,6 @@ done:
                port_assign(port, last);
 
        /* 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));
 
 unlock:
@@ -655,6 +653,9 @@ unlock:
                execlists_set_active(execlists, EXECLISTS_ACTIVE_USER);
                execlists_submit_ports(engine);
        }
+
+       GEM_BUG_ON(port_isset(execlists->port) &&
+                  !execlists_is_active(execlists, EXECLISTS_ACTIVE_USER));
 }
 
 void