drm/i915: Acquire the signaler's timeline HWSP last

Acquiring the signaler's timeline takes an active reference to their
HWSP that we would like to avoid if possible, so take it after
performing all of our allocations required to set up the fencing. The
acquisition also provides the final check that the target has not
already signaled allowing us to avoid the semaphore at the last moment.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190503140239.32668-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index ae9ce46e1b15055e886a4cfce0b661b8332032b5..e0be00c07c24206ed3b458e6803c003038dd4e5d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -851,13 +851,13 @@ emit_semaphore_wait(struct i915_request *to,
        if (err < 0)
                return err;
 
-       /* We need to pin the signaler's HWSP until we are finished reading. */
-       err = i915_timeline_read_hwsp(from, to, &hwsp_offset);
+       /* Only submit our spinner after the signaler is running! */
+       err = i915_request_await_execution(to, from, gfp);
        if (err)
                return err;
 
-       /* Only submit our spinner after the signaler is running! */
-       err = i915_request_await_execution(to, from, gfp);
+       /* We need to pin the signaler's HWSP until we are finished reading. */
+       err = i915_timeline_read_hwsp(from, to, &hwsp_offset);
        if (err)
                return err;