drm/i915/gem: Perform all asynchronous waits prior to marking payload start

The initial breadcrumb marks the transition from context wait and setup
into the request payload. We use the marker to determine if the request
is merely waiting to begin, or is inside the payload and hung.
Forgetting to include a breadcrumb before the user payload would mean we
do not reset the guilty user request, and conversely if the initial
breadcrumb is too early we blame the user for a problem elsewhere.

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

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c
index 272cf3e..44821d9 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c
@@ -202,12 +202,6 @@ retry:
        if (unlikely(err))
                goto out_request;
 
-       if (w->ce->engine->emit_init_breadcrumb) {
-               err = w->ce->engine->emit_init_breadcrumb(rq);
-               if (unlikely(err))
-                       goto out_request;
-       }
-
        /*
         * w->dma is already exported via (vma|obj)->resv we need only
         * keep track of the GPU activity within this vma/request, and
@@ -217,9 +211,15 @@ retry:
        if (err)
                goto out_request;
 
-       err = w->ce->engine->emit_bb_start(rq,
-                                          batch->node.start, batch->node.size,
-                                          0);
+       if (rq->engine->emit_init_breadcrumb) {
+               err = rq->engine->emit_init_breadcrumb(rq);
+               if (unlikely(err))
+                       goto out_request;
+       }
+
+       err = rq->engine->emit_bb_start(rq,
+                                       batch->node.start, batch->node.size,
+                                       0);
 out_request:
        if (unlikely(err)) {
                i915_request_set_error_once(rq, err);