Commit cef437ad authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Make intel_lr_context_render_state_init() static 



This function is only used in intel_lrc.c, so restrict it to that file. The
function was moved around to avoid a forward declaration and group it with its
user.

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a01c7162

drivers/gpu/drm/i915/intel_lrc.c

+33 −33
Original line number Diff line number Diff line
@@ -1323,6 +1323,39 @@ 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)

{

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

	struct render_state so;

	struct drm_i915_file_private *file_priv = ctx->file_priv;

	struct drm_file *file = file_priv ? file_priv->file : NULL;

	int ret;



	ret = i915_gem_render_state_prepare(ring, &so);

	if (ret)

		return ret;



	if (so.rodata == NULL)

		return 0;



	ret = ring->emit_bb_start(ringbuf,

			ctx,

			so.ggtt_offset,

			I915_DISPATCH_SECURE);

	if (ret)

		goto out;



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



	ret = __i915_add_request(ring, file, so.obj);

	/* intel_logical_ring_add_request moves object to inactive if it

	 * fails */

out:

	i915_gem_render_state_fini(&so);

	return ret;

}



static int gen8_init_rcs_context(struct intel_engine_cs *ring,

		       struct intel_context *ctx)

{
@@ -1588,39 +1621,6 @@ cleanup_render_ring: 
	return ret;

}



int intel_lr_context_render_state_init(struct intel_engine_cs *ring,

				       struct intel_context *ctx)

{

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

	struct render_state so;

	struct drm_i915_file_private *file_priv = ctx->file_priv;

	struct drm_file *file = file_priv ? file_priv->file : NULL;

	int ret;



	ret = i915_gem_render_state_prepare(ring, &so);

	if (ret)

		return ret;



	if (so.rodata == NULL)

		return 0;



	ret = ring->emit_bb_start(ringbuf,

			ctx,

			so.ggtt_offset,

			I915_DISPATCH_SECURE);

	if (ret)

		goto out;



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



	ret = __i915_add_request(ring, file, so.obj);

	/* intel_logical_ring_add_request moves object to inactive if it

	 * fails */

out:

	i915_gem_render_state_fini(&so);

	return ret;

}



static int

populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_obj,

		    struct intel_engine_cs *ring, struct intel_ringbuffer *ringbuf)

drivers/gpu/drm/i915/intel_lrc.h

+0 −2
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ int intel_logical_ring_begin(struct intel_ringbuffer *ringbuf, 
			     int num_dwords);



/* Logical Ring Contexts */

int intel_lr_context_render_state_init(struct intel_engine_cs *ring,

				       struct intel_context *ctx);

void intel_lr_context_free(struct intel_context *ctx);

int intel_lr_context_deferred_create(struct intel_context *ctx,

				     struct intel_engine_cs *ring);

CRA Git | Maintained and supported by SUSTech CRA and CCSE