Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 158863fb authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Make global seqno known in i915_gem_request_execute tracepoint 



Commit fe49789f ("drm/i915: Deconstruct execute fence") re-arranged
the code and moved the i915_gem_request_execute tracepoint to before the
global seqno is assigned to the request.

We need to move the tracepoint a bit later so this information is once
again available.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: fe49789f ("drm/i915: Deconstruct execute fence")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180220104742.565-1-tvrtko.ursulin@linux.intel.com
parent fed81658

drivers/gpu/drm/i915/i915_gem_request.c

+2 −2
Original line number Diff line number Diff line
@@ -490,8 +490,6 @@ void __i915_gem_request_submit(struct drm_i915_gem_request *request) 
	GEM_BUG_ON(!irqs_disabled());

	lockdep_assert_held(&engine->timeline->lock);



	trace_i915_gem_request_execute(request);



	/* Transfer from per-context onto the global per-engine timeline */

	timeline = engine->timeline;

	GEM_BUG_ON(timeline == request->timeline);
@@ -515,6 +513,8 @@ void __i915_gem_request_submit(struct drm_i915_gem_request *request) 
	list_move_tail(&request->link, &timeline->requests);

	spin_unlock(&request->timeline->lock);



	trace_i915_gem_request_execute(request);



	wake_up_all(&request->execute);

}