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

Commit 0f25dff6 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Reorder i915_add_request to separate the phases better 



Let's avoid mixing sealing the hardware commands for the request and
adding the request to the software tracking.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160909131201.16673-15-chris@chris-wilson.co.uk
parent 5590af3e

drivers/gpu/drm/i915/i915_gem_request.c

+14 −14
Original line number Diff line number Diff line
@@ -494,6 +494,8 @@ void __i915_add_request(struct drm_i915_gem_request *request, bool flush_caches) 
	u32 reserved_tail;

	int ret;



	trace_i915_gem_request_add(request);



	/*

	 * To ensure that this call will not fail, space for its emissions

	 * should already have been reserved in the ring buffer. Let the ring
@@ -517,20 +519,6 @@ void __i915_add_request(struct drm_i915_gem_request *request, bool flush_caches) 
		WARN(ret, "engine->emit_flush() failed: %d!\n", ret);

	}



	trace_i915_gem_request_add(request);



	/* Seal the request and mark it as pending execution. Note that

	 * we may inspect this state, without holding any locks, during

	 * hangcheck. Hence we apply the barrier to ensure that we do not

	 * see a more recent value in the hws than we are tracking.

	 */

	request->emitted_jiffies = jiffies;

	request->previous_seqno = engine->last_submitted_seqno;

	engine->last_submitted_seqno = request->fence.seqno;

	i915_gem_active_set(&engine->last_request, request);

	list_add_tail(&request->link, &engine->request_list);

	list_add_tail(&request->ring_link, &ring->request_list);



	/* Record the position of the start of the breadcrumb so that

	 * should we detect the updated seqno part-way through the

	 * GPU processing the request, we never over-estimate the
@@ -551,6 +539,18 @@ void __i915_add_request(struct drm_i915_gem_request *request, bool flush_caches) 
		  "for adding the request (%d bytes)\n",

		  reserved_tail, ret);



	/* Seal the request and mark it as pending execution. Note that

	 * we may inspect this state, without holding any locks, during

	 * hangcheck. Hence we apply the barrier to ensure that we do not

	 * see a more recent value in the hws than we are tracking.

	 */

	request->emitted_jiffies = jiffies;

	request->previous_seqno = engine->last_submitted_seqno;

	engine->last_submitted_seqno = request->fence.seqno;

	i915_gem_active_set(&engine->last_request, request);

	list_add_tail(&request->link, &engine->request_list);

	list_add_tail(&request->ring_link, &ring->request_list);



	i915_gem_mark_busy(engine);



	local_bh_disable();