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

Commit f73e7399 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Swap if(enable_execlists) in i915_gem_request_alloc for a vfunc 



A fairly trivial move of a matching pair of routines (for preparing a
request for construction) onto an engine vfunc. The ulterior motive is
to be able to create a mock request implementation.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161218153724.8439-7-chris@chris-wilson.co.uk
parent 2947e408

drivers/gpu/drm/i915/i915_gem_request.c

+1 −4
Original line number Diff line number Diff line
@@ -622,10 +622,7 @@ i915_gem_request_alloc(struct intel_engine_cs *engine, 
	req->reserved_space = MIN_SPACE_FOR_ADD_REQUEST;

	GEM_BUG_ON(req->reserved_space < engine->emit_breadcrumb_sz);



	if (i915.enable_execlists)

		ret = intel_logical_ring_alloc_request_extras(req);

	else

		ret = intel_ring_alloc_request_extras(req);

	ret = engine->request_alloc(req);

	if (ret)

		goto err_ctx;

drivers/gpu/drm/i915/intel_lrc.c

+3 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ static void execlists_context_unpin(struct intel_engine_cs *engine, 
	i915_gem_context_put(ctx);

}



int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request)

static int execlists_request_alloc(struct drm_i915_gem_request *request)

{

	struct intel_engine_cs *engine = request->engine;

	struct intel_context *ce = &request->ctx->engine[engine->id];
@@ -1816,6 +1816,8 @@ logical_ring_default_vfuncs(struct intel_engine_cs *engine) 
	engine->context_pin = execlists_context_pin;

	engine->context_unpin = execlists_context_unpin;



	engine->request_alloc = execlists_request_alloc;



	engine->emit_flush = gen8_emit_flush;

	engine->emit_breadcrumb = gen8_emit_breadcrumb;

	engine->emit_breadcrumb_sz = gen8_emit_breadcrumb_sz;

drivers/gpu/drm/i915/intel_lrc.h

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ enum { 
};



/* Logical Rings */

int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request);

int intel_logical_ring_reserve_space(struct drm_i915_gem_request *request);

void intel_logical_ring_stop(struct intel_engine_cs *engine);

void intel_logical_ring_cleanup(struct intel_engine_cs *engine);

int logical_render_ring_init(struct intel_engine_cs *engine);

drivers/gpu/drm/i915/intel_ringbuffer.c

+3 −1
Original line number Diff line number Diff line
@@ -2103,7 +2103,7 @@ void intel_legacy_submission_resume(struct drm_i915_private *dev_priv) 
	}

}



int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request)

static int ring_request_alloc(struct drm_i915_gem_request *request)

{

	int ret;
@@ -2598,6 +2598,8 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, 
	engine->context_pin = intel_ring_context_pin;

	engine->context_unpin = intel_ring_context_unpin;



	engine->request_alloc = ring_request_alloc;



	engine->emit_breadcrumb = i9xx_emit_breadcrumb;

	engine->emit_breadcrumb_sz = i9xx_emit_breadcrumb_sz;

	if (i915.semaphores) {

drivers/gpu/drm/i915/intel_ringbuffer.h

+1 −2
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ struct intel_engine_cs { 
				       struct i915_gem_context *ctx);

	void		(*context_unpin)(struct intel_engine_cs *engine,

					 struct i915_gem_context *ctx);

	int		(*request_alloc)(struct drm_i915_gem_request *req);

	int		(*init_context)(struct drm_i915_gem_request *req);



	int		(*emit_flush)(struct drm_i915_gem_request *request,
@@ -491,8 +492,6 @@ void intel_engine_cleanup(struct intel_engine_cs *engine); 


void intel_legacy_submission_resume(struct drm_i915_private *dev_priv);



int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request);



int __must_check intel_ring_begin(struct drm_i915_gem_request *req, int n);

int __must_check intel_ring_cacheline_align(struct drm_i915_gem_request *req);