]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915: Fix system hang with EI UP masked on Haswell
authorMika Kuoppala <mika.kuoppala@linux.intel.com>
Thu, 13 Apr 2017 11:15:27 +0000 (14:15 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 26 Apr 2017 13:28:28 +0000 (16:28 +0300)
commitacf2dc2266b99be9103b5c35acbb8f9fe923bf3d
tree0bf83b6e2b83930330b6092468d43126d2529883
parent5af9e672b84f006695b820f791f2eceecca59bbc
drm/i915: Fix system hang with EI UP masked on Haswell

Previously with commit a9c1f90c8e17
("drm/i915: Don't mask EI UP interrupt on IVB|SNB") certain,
seemingly unrelated bit (GEN6_PM_RP_UP_EI_EXPIRED) was needed
to be unmasked for IVB and SNB in order to prevent system hang
with chained batchbuffers.

Our CI was seeing incomplete results with tests that used
chained batches and it was found out that HSW needs to have this
same bit unmasked to reliably survive chained batches.

Always unmask GEN6_PM_RP_UP_EI_EXPIRED on Haswell to
prevent system hang with batch chaining.

Testcase: igt/gem_exec_fence/nb-await-default
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100672
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1492082127-29007-1-git-send-email-mika.kuoppala@intel.com
(cherry picked from commit 3396a273851c14634b98bb27be37508b06df94f4)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_irq.c