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

Commit 2ae55738 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Clear the last_retired_context following a hang/reset 



Following a hang and reset, we know that the engine is idle and all
context state has been saved or lost. Consequently, we know that the
engine is no longer referencing the last context and we can relinquish
our tracking.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Tvrtko Ursulin <tursulin@ursulin.net>
Link: http://patchwork.freedesktop.org/patch/msgid/20170212172002.23072-5-chris@chris-wilson.co.uk


Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
parent fe3288b5

drivers/gpu/drm/i915/i915_gem.c

+7 −1
Original line number Diff line number Diff line
@@ -2788,8 +2788,14 @@ void i915_gem_reset(struct drm_i915_private *dev_priv) 


	i915_gem_retire_requests(dev_priv);



	for_each_engine(engine, dev_priv, id)

	for_each_engine(engine, dev_priv, id) {

		struct i915_gem_context *ctx;



		i915_gem_reset_engine(engine);

		ctx = fetch_and_zero(&engine->last_retired_context);

		if (ctx)

			engine->context_unpin(engine, ctx);

	}



	i915_gem_restore_fences(dev_priv);