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

Commit 771b9a53 authored by Michel Thierry's avatar Michel Thierry Committed by Daniel Vetter
Browse files

drm/i915: Initialize workarounds in logical ring mode too 



Following the legacy ring submission example, update the
ring->init_context() hook to support the execlist submission mode.

v2: update to use the new workaround macros and cleanup unused code.
This takes care of both bdw and chv workarounds.

v2.1: Add missing call to init_context() during deferred context creation.

v3: Split init_context (emit) in legacy/lrc modes. For lrc, get the ringbuf
from the context (Mika/Daniel).

v4: Merge init_context interfaces back, the legacy mode only needs the ring,
but the lrc mode needs the ring and context (Mika).

Issue: VIZ-4092
Issue: GMIN-3475
Change-Id: Ie3d093b2542ab0e2a44b90460533e2f979788d6c
Cc: Deepak S <deepak.s@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Signed-off-by: default avatarArun Siluvery <arun.siluvery@linux.intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
[danvet: Align function paramater lists properly.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c6e8f39d

drivers/gpu/drm/i915/i915_gem_context.c

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ static int do_switch(struct intel_engine_cs *ring, 


	if (uninitialized) {

		if (ring->init_context) {

			ret = ring->init_context(ring);

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

			if (ret)

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

		}

drivers/gpu/drm/i915/intel_lrc.c

+46 −1
Original line number Diff line number Diff line
@@ -989,6 +989,44 @@ int intel_logical_ring_begin(struct intel_ringbuffer *ringbuf, int num_dwords) 
	return 0;

}



static int intel_logical_ring_workarounds_emit(struct intel_engine_cs *ring,

					       struct intel_context *ctx)

{

	int ret, i;

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

	struct drm_device *dev = ring->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct i915_workarounds *w = &dev_priv->workarounds;



	if (WARN_ON(w->count == 0))

		return 0;



	ring->gpu_caches_dirty = true;

	ret = logical_ring_flush_all_caches(ringbuf);

	if (ret)

		return ret;



	ret = intel_logical_ring_begin(ringbuf, w->count * 2 + 2);

	if (ret)

		return ret;



	intel_logical_ring_emit(ringbuf, MI_LOAD_REGISTER_IMM(w->count));

	for (i = 0; i < w->count; i++) {

		intel_logical_ring_emit(ringbuf, w->reg[i].addr);

		intel_logical_ring_emit(ringbuf, w->reg[i].value);

	}

	intel_logical_ring_emit(ringbuf, MI_NOOP);



	intel_logical_ring_advance(ringbuf);



	ring->gpu_caches_dirty = true;

	ret = logical_ring_flush_all_caches(ringbuf);

	if (ret)

		return ret;



	return 0;

}



static int gen8_init_common_ring(struct intel_engine_cs *ring)

{

	struct drm_device *dev = ring->dev;
@@ -1032,7 +1070,7 @@ static int gen8_init_render_ring(struct intel_engine_cs *ring) 


	I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING));



	return ret;

	return init_workarounds_ring(ring);

}



static int gen8_emit_bb_start(struct intel_ringbuffer *ringbuf,
@@ -1282,6 +1320,7 @@ static int logical_render_ring_init(struct drm_device *dev) 
		ring->irq_keep_mask |= GT_RENDER_L3_PARITY_ERROR_INTERRUPT;



	ring->init = gen8_init_render_ring;

	ring->init_context = intel_logical_ring_workarounds_emit;

	ring->cleanup = intel_fini_pipe_control;

	ring->get_seqno = gen8_get_seqno;

	ring->set_seqno = gen8_set_seqno;
@@ -1763,6 +1802,12 @@ int intel_lr_context_deferred_create(struct intel_context *ctx, 
	}



	if (ring->id == RCS && !ctx->rcs_initialized) {

		if (ring->init_context) {

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

			if (ret)

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

		}



		ret = intel_lr_context_render_state_init(ring, ctx);

		if (ret) {

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

drivers/gpu/drm/i915/intel_ringbuffer.c

+3 −2
Original line number Diff line number Diff line
@@ -665,7 +665,8 @@ intel_init_pipe_control(struct intel_engine_cs *ring) 
	return ret;

}



static int intel_ring_workarounds_emit(struct intel_engine_cs *ring)

static int intel_ring_workarounds_emit(struct intel_engine_cs *ring,

				       struct intel_context *ctx)

{

	int ret, i;

	struct drm_device *dev = ring->dev;
@@ -806,7 +807,7 @@ static int chv_init_workarounds(struct intel_engine_cs *ring) 
	return 0;

}



static int init_workarounds_ring(struct intel_engine_cs *ring)

int init_workarounds_ring(struct intel_engine_cs *ring)

{

	struct drm_device *dev = ring->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

drivers/gpu/drm/i915/intel_ringbuffer.h

+4 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ struct intel_engine_cs { 


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



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

	int		(*init_context)(struct intel_engine_cs *ring,

					struct intel_context *ctx);



	void		(*write_tail)(struct intel_engine_cs *ring,

				      u32 value);
@@ -424,6 +425,8 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev); 
u64 intel_ring_get_active_head(struct intel_engine_cs *ring);

void intel_ring_setup_status_page(struct intel_engine_cs *ring);



int init_workarounds_ring(struct intel_engine_cs *ring);



static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)

{

	return ringbuf->tail;