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

Commit cc3c4253 authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter
Browse files

drm/i915: Convert execlists_elsp_writ() for requests 



Pass around requests to carry context deeper in callchain.

Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 8ba319da

drivers/gpu/drm/i915/intel_lrc.c

+9 −11
Original line number Diff line number Diff line
@@ -292,12 +292,16 @@ static uint64_t execlists_ctx_descriptor(struct intel_engine_cs *ring, 
	return desc;

}



static void execlists_elsp_write(struct intel_engine_cs *ring,

				 struct drm_i915_gem_object *ctx_obj0,

				 struct drm_i915_gem_object *ctx_obj1)

static void execlists_elsp_write(struct drm_i915_gem_request *rq0,

				 struct drm_i915_gem_request *rq1)

{



	struct intel_engine_cs *ring = rq0->ring;

	struct drm_device *dev = ring->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_gem_object *ctx_obj0 = rq0->ctx->engine[ring->id].state;

	struct drm_i915_gem_object *ctx_obj1 = rq1 ?

		rq1->ctx->engine[ring->id].state : NULL;

	uint64_t temp = 0;

	uint32_t desc[4];
@@ -365,18 +369,12 @@ static int execlists_update_context(struct drm_i915_gem_request *rq) 
static void execlists_submit_requests(struct drm_i915_gem_request *rq0,

				      struct drm_i915_gem_request *rq1)

{

	struct intel_engine_cs *ring = rq0->ring;

	struct drm_i915_gem_object *ctx_obj0 = rq0->ctx->engine[ring->id].state;

	struct drm_i915_gem_object *ctx_obj1 = NULL;



	execlists_update_context(rq0);



	if (rq1) {

	if (rq1)

		execlists_update_context(rq1);

		ctx_obj1 = rq1->ctx->engine[ring->id].state;

	}



	execlists_elsp_write(ring, ctx_obj0, ctx_obj1);

	execlists_elsp_write(rq0, rq1);

}



static void execlists_context_unqueue(struct intel_engine_cs *ring)