Commit 8ba319da authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Simona Vetter
Browse files

drm/i915: Convert intel_lr_context_pin() 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 f3cc01f0

drivers/gpu/drm/i915/i915_gem.c

+3 −5
Original line number Diff line number Diff line
@@ -2620,10 +2620,8 @@ void i915_gem_request_free(struct kref *req_ref) 


	if (ctx) {

		if (i915.enable_execlists) {

			struct intel_engine_cs *ring = req->ring;



			if (ctx != ring->default_context)

				intel_lr_context_unpin(ring, ctx);

			if (ctx != req->ring->default_context)

				intel_lr_context_unpin(req);

		}



		i915_gem_context_unreference(ctx);
@@ -2765,7 +2763,7 @@ static void i915_gem_reset_ring_cleanup(struct drm_i915_private *dev_priv, 
		list_del(&submit_req->execlist_link);



		if (submit_req->ctx != ring->default_context)

			intel_lr_context_unpin(ring, submit_req->ctx);

			intel_lr_context_unpin(submit_req);



		i915_gem_request_unreference(submit_req);

	}

drivers/gpu/drm/i915/intel_lrc.c

+15 −16
Original line number Diff line number Diff line
@@ -211,8 +211,7 @@ enum { 
#define GEN8_CTX_ID_SHIFT 32

#define CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT  0x17



static int intel_lr_context_pin(struct intel_engine_cs *ring,

		struct intel_context *ctx);

static int intel_lr_context_pin(struct drm_i915_gem_request *rq);



/**

 * intel_sanitize_enable_execlists() - sanitize i915.enable_execlists
@@ -541,7 +540,7 @@ static int execlists_context_queue(struct drm_i915_gem_request *request) 
	int num_elements = 0;



	if (request->ctx != ring->default_context)

		intel_lr_context_pin(ring, request->ctx);

		intel_lr_context_pin(request);



	i915_gem_request_reference(request);
@@ -636,7 +635,7 @@ int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request 
	request->ringbuf = request->ctx->engine[request->ring->id].ringbuf;



	if (request->ctx != request->ring->default_context) {

		ret = intel_lr_context_pin(request->ring, request->ctx);

		ret = intel_lr_context_pin(request);

		if (ret)

			return ret;

	}
@@ -950,7 +949,7 @@ void intel_execlists_retire_requests(struct intel_engine_cs *ring) 
				ctx->engine[ring->id].state;



		if (ctx_obj && (ctx != ring->default_context))

			intel_lr_context_unpin(ring, ctx);

			intel_lr_context_unpin(req);

		list_del(&req->execlist_link);

		i915_gem_request_unreference(req);

	}
@@ -994,15 +993,15 @@ int logical_ring_flush_all_caches(struct drm_i915_gem_request *req) 
	return 0;

}



static int intel_lr_context_pin(struct intel_engine_cs *ring,

		struct intel_context *ctx)

static int intel_lr_context_pin(struct drm_i915_gem_request *rq)

{

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

	struct intel_ringbuffer *ringbuf = ctx->engine[ring->id].ringbuf;

	struct intel_engine_cs *ring = rq->ring;

	struct drm_i915_gem_object *ctx_obj = rq->ctx->engine[ring->id].state;

	struct intel_ringbuffer *ringbuf = rq->ringbuf;

	int ret = 0;



	WARN_ON(!mutex_is_locked(&ring->dev->struct_mutex));

	if (ctx->engine[ring->id].pin_count++ == 0) {

	if (rq->ctx->engine[ring->id].pin_count++ == 0) {

		ret = i915_gem_obj_ggtt_pin(ctx_obj,

				GEN8_LR_CONTEXT_ALIGN, 0);

		if (ret)
@@ -1018,20 +1017,20 @@ static int intel_lr_context_pin(struct intel_engine_cs *ring, 
unpin_ctx_obj:

	i915_gem_object_ggtt_unpin(ctx_obj);

reset_pin_count:

	ctx->engine[ring->id].pin_count = 0;

	rq->ctx->engine[ring->id].pin_count = 0;



	return ret;

}



void intel_lr_context_unpin(struct intel_engine_cs *ring,

		struct intel_context *ctx)

void intel_lr_context_unpin(struct drm_i915_gem_request *rq)

{

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

	struct intel_ringbuffer *ringbuf = ctx->engine[ring->id].ringbuf;

	struct intel_engine_cs *ring = rq->ring;

	struct drm_i915_gem_object *ctx_obj = rq->ctx->engine[ring->id].state;

	struct intel_ringbuffer *ringbuf = rq->ringbuf;



	if (ctx_obj) {

		WARN_ON(!mutex_is_locked(&ring->dev->struct_mutex));

		if (--ctx->engine[ring->id].pin_count == 0) {

		if (--rq->ctx->engine[ring->id].pin_count == 0) {

			intel_unpin_ringbuffer_obj(ringbuf);

			i915_gem_object_ggtt_unpin(ctx_obj);

		}

drivers/gpu/drm/i915/intel_lrc.h

+1 −2
Original line number Diff line number Diff line
@@ -70,8 +70,7 @@ static inline void intel_logical_ring_emit(struct intel_ringbuffer *ringbuf, 
void intel_lr_context_free(struct intel_context *ctx);

int intel_lr_context_deferred_create(struct intel_context *ctx,

				     struct intel_engine_cs *ring);

void intel_lr_context_unpin(struct intel_engine_cs *ring,

		struct intel_context *ctx);

void intel_lr_context_unpin(struct drm_i915_gem_request *req);

void intel_lr_context_reset(struct drm_device *dev,

			struct intel_context *ctx);