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

Commit 70962fbe authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Remove disable_lite_restore_wa 



This w/a (WaEnableForceRestoreInCtxtDescForVCS) was only used for
preproduction hw, which is no longer in use.  Remove the workaround to
simplify the code.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170123130601.2281-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 7c518460

drivers/gpu/drm/i915/intel_lrc.c

+1 −10
Original line number Diff line number Diff line
@@ -272,10 +272,6 @@ logical_ring_init_platform_invariants(struct intel_engine_cs *engine) 
{

	struct drm_i915_private *dev_priv = engine->i915;



	engine->disable_lite_restore_wa =

		IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1) &&

		(engine->id == VCS || engine->id == VCS2);



	engine->ctx_desc_template = GEN8_CTX_VALID;

	if (IS_GEN8(dev_priv))

		engine->ctx_desc_template |= GEN8_CTX_L3LLC_COHERENT;
@@ -284,11 +280,6 @@ logical_ring_init_platform_invariants(struct intel_engine_cs *engine) 
	/* TODO: WaDisableLiteRestore when we start using semaphore

	 * signalling between Command Streamers */

	/* ring->ctx_desc_template |= GEN8_CTX_FORCE_RESTORE; */



	/* WaEnableForceRestoreInCtxtDescForVCS:skl */

	/* WaEnableForceRestoreInCtxtDescForVCS:bxt */

	if (engine->disable_lite_restore_wa)

		engine->ctx_desc_template |= GEN8_CTX_FORCE_RESTORE;

}



/**
@@ -558,7 +549,7 @@ static bool execlists_elsp_ready(struct intel_engine_cs *engine) 
	int port;



	port = 1; /* wait for a free slot */

	if (engine->disable_lite_restore_wa || engine->preempt_wa)

	if (engine->preempt_wa)

		port = 0; /* wait for GPU to be idle before continuing */



	return !engine->execlist_port[port].request;

drivers/gpu/drm/i915/intel_ringbuffer.h

+0 −1
Original line number Diff line number Diff line
@@ -380,7 +380,6 @@ struct intel_engine_cs { 
	struct rb_root execlist_queue;

	struct rb_node *execlist_first;

	unsigned int fw_domains;

	bool disable_lite_restore_wa;

	bool preempt_wa;

	u32 ctx_desc_template;