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

Commit 5f5800a7 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Push EMIT_INVALIDATE at request start to backends 



Move the common engine->emit_flush(EMIT_INVALIDATE) back to the backends
(where it was once previously) as we seek to specialise it in future
patches.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181207090213.14352-1-chris@chris-wilson.co.uk
parent d8f50531

drivers/gpu/drm/i915/i915_request.c

+0 −5
Original line number Diff line number Diff line
@@ -719,11 +719,6 @@ i915_request_alloc(struct intel_engine_cs *engine, struct i915_gem_context *ctx) 
	 */

	rq->head = rq->ring->emit;



	/* Unconditionally invalidate GPU caches and TLBs. */

	ret = engine->emit_flush(rq, EMIT_INVALIDATE);

	if (ret)

		goto err_unwind;



	ret = engine->request_alloc(rq);

	if (ret)

		goto err_unwind;

drivers/gpu/drm/i915/intel_lrc.c

+6 −3
Original line number Diff line number Diff line
@@ -1276,17 +1276,20 @@ static int execlists_request_alloc(struct i915_request *request) 


	GEM_BUG_ON(!request->hw_context->pin_count);



	/* Flush enough space to reduce the likelihood of waiting after

	/*

	 * Flush enough space to reduce the likelihood of waiting after

	 * we start building the request - in which case we will just

	 * have to repeat work.

	 */

	request->reserved_space += EXECLISTS_REQUEST_SIZE;



	ret = intel_ring_wait_for_space(request->ring, request->reserved_space);

	/* Unconditionally invalidate GPU caches and TLBs. */

	ret = request->engine->emit_flush(request, EMIT_INVALIDATE);

	if (ret)

		return ret;



	/* Note that after this point, we have committed to using

	/*

	 * Note that after this point, we have committed to using

	 * this request as it is being used to both track the

	 * state of engine initialisation and liveness of the

	 * golden renderstate above. Think twice before you try

drivers/gpu/drm/i915/intel_ringbuffer.c

+4 −2
Original line number Diff line number Diff line
@@ -1820,13 +1820,15 @@ static int ring_request_alloc(struct i915_request *request) 


	GEM_BUG_ON(!request->hw_context->pin_count);



	/* Flush enough space to reduce the likelihood of waiting after

	/*

	 * Flush enough space to reduce the likelihood of waiting after

	 * we start building the request - in which case we will just

	 * have to repeat work.

	 */

	request->reserved_space += LEGACY_REQUEST_SIZE;



	ret = intel_ring_wait_for_space(request->ring, request->reserved_space);

	/* Unconditionally invalidate GPU caches and TLBs. */

	ret = request->engine->emit_flush(request, EMIT_INVALIDATE);

	if (ret)

		return ret;