drm/i915: Remove tasklet flush before disable
The idea was to try and let the existing tasklet run to completion before we began the reset, but it involves a racy check against anything else that tries to run the tasklet. Rather than acknowledge and ignore the race, let it be and don't try and be too clever. The tasklet will resume execution after reset (after spinning a bit during reset), but before we allow it to resume we will have cleared all the pending state. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180516183355.10553-1-chris@chris-wilson.co.uk
This commit is contained in:
parent
e7f2af7894
commit
b8444cf85b
|
@ -3035,16 +3035,7 @@ i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)
|
|||
* calling engine->init_hw() and also writing the ELSP.
|
||||
* Turning off the execlists->tasklet until the reset is over
|
||||
* prevents the race.
|
||||
*
|
||||
* Note that this needs to be a single atomic operation on the
|
||||
* tasklet (flush existing tasks, prevent new tasks) to prevent
|
||||
* a race between reset and set-wedged. It is not, so we do the best
|
||||
* we can atm and make sure we don't lock the machine up in the more
|
||||
* common case of recursively being called from set-wedged from inside
|
||||
* i915_reset.
|
||||
*/
|
||||
if (!atomic_read(&engine->execlists.tasklet.count))
|
||||
tasklet_kill(&engine->execlists.tasklet);
|
||||
tasklet_disable(&engine->execlists.tasklet);
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue