Commit 8753181e authored by John Harrison's avatar John Harrison Committed by Daniel Vetter
Browse files

drm/i915: Update init_context() to take a request structure 



Now that everything above has been converted to use requests, it is possible to
update init_context() to take a request pointer instead of a ring/context pair.

For: VIZ-5115
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarTomas Elf <tomas.elf@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 76c39168

drivers/gpu/drm/i915/i915_gem_context.c

+2 −2
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ int i915_gem_context_enable(struct drm_i915_gem_request *req) 
		if (ring->init_context == NULL)

			return 0;



		ret = ring->init_context(ring, ring->default_context);

		ret = ring->init_context(req);

	} else

		ret = i915_switch_context(req);
@@ -760,7 +760,7 @@ done: 


	if (uninitialized) {

		if (ring->init_context) {

			ret = ring->init_context(ring, to);

			ret = ring->init_context(req);

			if (ret)

				DRM_ERROR("ring init context: %d\n", ret);

		}

drivers/gpu/drm/i915/intel_lrc.c

+4 −5
Original line number Diff line number Diff line
@@ -1602,16 +1602,15 @@ out: 
	return ret;

}



static int gen8_init_rcs_context(struct intel_engine_cs *ring,

		       struct intel_context *ctx)

static int gen8_init_rcs_context(struct drm_i915_gem_request *req)

{

	int ret;



	ret = intel_logical_ring_workarounds_emit(ring, ctx);

	ret = intel_logical_ring_workarounds_emit(req->ring, req->ctx);

	if (ret)

		return ret;



	return intel_lr_context_render_state_init(ring, ctx);

	return intel_lr_context_render_state_init(req->ring, req->ctx);

}



/**
@@ -2236,7 +2235,7 @@ int intel_lr_context_deferred_create(struct intel_context *ctx, 
			if (ret)

				return ret;



			ret = ring->init_context(req->ring, ctx);

			ret = ring->init_context(req);

			if (ret) {

				DRM_ERROR("ring init context: %d\n", ret);

				i915_gem_request_cancel(req);

drivers/gpu/drm/i915/intel_ringbuffer.c

+3 −4
Original line number Diff line number Diff line
@@ -742,16 +742,15 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring, 
	return 0;

}



static int intel_rcs_ctx_init(struct intel_engine_cs *ring,

			      struct intel_context *ctx)

static int intel_rcs_ctx_init(struct drm_i915_gem_request *req)

{

	int ret;



	ret = intel_ring_workarounds_emit(ring, ctx);

	ret = intel_ring_workarounds_emit(req->ring, req->ctx);

	if (ret != 0)

		return ret;



	ret = i915_gem_render_state_init(ring);

	ret = i915_gem_render_state_init(req->ring);

	if (ret)

		DRM_ERROR("init render state: %d\n", ret);

drivers/gpu/drm/i915/intel_ringbuffer.h

+1 −2
Original line number Diff line number Diff line
@@ -176,8 +176,7 @@ struct intel_engine_cs { 


	int		(*init_hw)(struct intel_engine_cs *ring);



	int		(*init_context)(struct intel_engine_cs *ring,

					struct intel_context *ctx);

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



	void		(*write_tail)(struct intel_engine_cs *ring,

				      u32 value);

CRA Git | Maintained and supported by SUSTech CRA and CCSE