]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Protect gen7 irq_seqno_barrier with uncore lock
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 27 Apr 2016 08:02:01 +0000 (09:02 +0100)
committerJani Nikula <jani.nikula@intel.com>
Mon, 23 May 2016 08:17:13 +0000 (11:17 +0300)
commitdb025f7329bf2943b16f0f5511b609dc0597d575
tree01f4b2e9dce97143311ad00b4189d5781c0f40c9
parent6f815286caa179cbcb4c2e7786bb256d7ac203d1
drm/i915: Protect gen7 irq_seqno_barrier with uncore lock

Faced with sporadic machine hangs on gen7, that mimic the issue of
concurrent writes to the same cacheline and seem to start with
commit f04133f3b8ac (drm/i915: Remove forcewake dance from seqno/irq
barrier on legacy gen6+), let us restore the spinlock around the mmio
read.

Fixes: f04133f3b8ac (drm/i915: Remove forcewake dance from seqno/irq...)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461744121-27051-1-git-send-email-chris@chris-wilson.co.uk
Tested-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
(cherry picked from commit bcbdb6d01150dcc1769ddc9baaaf7f102f27f919)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_ringbuffer.c