]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Disable engine->irq_tasklet around resets
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 8 Feb 2017 14:30:33 +0000 (14:30 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 8 Feb 2017 16:24:42 +0000 (16:24 +0000)
commit91f3be60191321e6e79325424f3fd51b3995d875
tree4faf8f805478204430229e9eb9649ac0ba8c4bdd
parente8f8b919d24ed9a678bbaddb51ce6cf968b251d0
drm/i915: Disable engine->irq_tasklet around resets

When we restart the engines, and we have active requests, a request on
the first engine may complete and queue a request to the second engine
before we try to restart the second engine. That queueing of the
request may race with the engine to restart, and so may corrupt the
current state. Disabling the engine->irq_tasklet prevents the two paths
from writing into ELSP simultaneously (and modifyin the execlists_port[]
at the same time).

Fixes: de44a5363c60 ("drm/i915: Update reset path to fix incomplete requests")
Testcase: igt/gem_exec_fence/await-hang
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170208143033.11651-3-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_gem.c