]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Disable engine->irq_tasklet around resets
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 13 Mar 2017 16:59:58 +0000 (16:59 +0000)
committerJani Nikula <jani.nikula@intel.com>
Tue, 14 Mar 2017 10:26:44 +0000 (12:26 +0200)
commit1eea62cc3ced0e450c6c984e376a592288190ee0
tree4c53350a807a3d418361dac81e4cc34d8874437d
parent9c4e7a3e078e384af3ee26a91e8e5221dff7d767
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).

Include fixup 1d309634bcf4 ("drm/i915: Kill the tasklet then disable")

Fixes: 6d06f21c4b91 ("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
Link: http://patchwork.freedesktop.org/patch/msgid/20170313165958.13970-2-chris@chris-wilson.co.uk
(cherry picked from commit 1f7b847d72c3583df5048d83bd945d0c2c524c28)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_gem.c