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

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



Updated the two render_state_init() functions to take a request pointer instead
of a ring. This removes their reliance on the OLR.

v2: Rebased to newer tree.

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 8753181e

drivers/gpu/drm/i915/i915_gem_render_state.c

+7 −7
Original line number Diff line number Diff line
@@ -152,26 +152,26 @@ int i915_gem_render_state_prepare(struct intel_engine_cs *ring, 
	return 0;

}



int i915_gem_render_state_init(struct intel_engine_cs *ring)

int i915_gem_render_state_init(struct drm_i915_gem_request *req)

{

	struct render_state so;

	int ret;



	ret = i915_gem_render_state_prepare(ring, &so);

	ret = i915_gem_render_state_prepare(req->ring, &so);

	if (ret)

		return ret;



	if (so.rodata == NULL)

		return 0;



	ret = ring->dispatch_execbuffer(ring,

	ret = req->ring->dispatch_execbuffer(req->ring,

					     so.ggtt_offset,

					     so.rodata->batch_items * 4,

					     I915_DISPATCH_SECURE);

	if (ret)

		goto out;



	i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), ring);

	i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), req->ring);



out:

	i915_gem_render_state_fini(&so);

drivers/gpu/drm/i915/i915_gem_render_state.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct render_state { 
	int gen;

};



int i915_gem_render_state_init(struct intel_engine_cs *ring);

int i915_gem_render_state_init(struct drm_i915_gem_request *req);

void i915_gem_render_state_fini(struct render_state *so);

int i915_gem_render_state_prepare(struct intel_engine_cs *ring,

				  struct render_state *so);

drivers/gpu/drm/i915/intel_lrc.c

+8 −10
Original line number Diff line number Diff line
@@ -1574,28 +1574,26 @@ static int gen8_emit_request(struct intel_ringbuffer *ringbuf, 
	return 0;

}



static int intel_lr_context_render_state_init(struct intel_engine_cs *ring,

					      struct intel_context *ctx)

static int intel_lr_context_render_state_init(struct drm_i915_gem_request *req)

{

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

	struct render_state so;

	int ret;



	ret = i915_gem_render_state_prepare(ring, &so);

	ret = i915_gem_render_state_prepare(req->ring, &so);

	if (ret)

		return ret;



	if (so.rodata == NULL)

		return 0;



	ret = ring->emit_bb_start(ringbuf,

			ctx,

	ret = req->ring->emit_bb_start(req->ringbuf,

				       req->ctx,

				       so.ggtt_offset,

				       I915_DISPATCH_SECURE);

	if (ret)

		goto out;



	i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), ring);

	i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), req->ring);



out:

	i915_gem_render_state_fini(&so);
@@ -1610,7 +1608,7 @@ static int gen8_init_rcs_context(struct drm_i915_gem_request *req) 
	if (ret)

		return ret;



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

	return intel_lr_context_render_state_init(req);

}



/**

drivers/gpu/drm/i915/intel_ringbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static int intel_rcs_ctx_init(struct drm_i915_gem_request *req) 
	if (ret != 0)

		return ret;



	ret = i915_gem_render_state_init(req->ring);

	ret = i915_gem_render_state_init(req);

	if (ret)

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE