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

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

drm/i915/skl: Provide a gen9 specific init_render_ring() 



WaDisableAsyncFlipPerfMode isn't listed for SKL and
INSTPM_FORCE_ORDERING is MBZ so let's make a gen9 specific render init
function.

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarNick Hoath <nicholas.hoath@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6f97235b

drivers/gpu/drm/i915/intel_lrc.c

+15 −1
Original line number Diff line number Diff line
@@ -1150,6 +1150,17 @@ static int gen8_init_render_ring(struct intel_engine_cs *ring) 
	return init_workarounds_ring(ring);

}



static int gen9_init_render_ring(struct intel_engine_cs *ring)

{

	int ret;



	ret = gen8_init_common_ring(ring);

	if (ret)

		return ret;



	return init_workarounds_ring(ring);

}



static int gen8_emit_bb_start(struct intel_ringbuffer *ringbuf,

			      struct intel_context *ctx,

			      u64 offset, unsigned flags)
@@ -1440,6 +1451,9 @@ static int logical_render_ring_init(struct drm_device *dev) 
	if (HAS_L3_DPF(dev))

		ring->irq_keep_mask |= GT_RENDER_L3_PARITY_ERROR_INTERRUPT;



	if (INTEL_INFO(dev)->gen >= 9)

		ring->init_hw = gen9_init_render_ring;

	else

		ring->init_hw = gen8_init_render_ring;

	ring->init_context = gen8_init_rcs_context;

	ring->cleanup = intel_fini_pipe_control;