From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 22 Jun 2016 22:25:52 +0000 (-0700)
Subject: 4.6-stable patches
X-Git-Tag: v3.14.73~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e5e5dddb315dbfe2a3c9fa8275b1a24ebc5c5c9;p=thirdparty%2Fkernel%2Fstable-queue.git

4.6-stable patches

added patches:
	revert-drm-i915-exit-cherryview_irq_handler-after-one-pass.patch
---

diff --git a/queue-4.6/revert-drm-i915-exit-cherryview_irq_handler-after-one-pass.patch b/queue-4.6/revert-drm-i915-exit-cherryview_irq_handler-after-one-pass.patch
new file mode 100644
index 00000000000..b2d54557a76
--- /dev/null
+++ b/queue-4.6/revert-drm-i915-exit-cherryview_irq_handler-after-one-pass.patch
@@ -0,0 +1,42 @@
+From 95654a3ae9b08840d57ecf79901fe88111567b62 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 22 Jun 2016 15:23:03 -0700
+Subject: Revert "drm/i915: Exit cherryview_irq_handler() after one pass"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 9dbaab56ac09f07a73fe83bf69bec3e31060080a.
+
+Turns out it was a bad idea and was fixed up "properly" in 4.7 but those
+patches are too big to put into 4.6, so let's just revert it for now.
+
+Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Cc: Daniel Vetter <daniel@ffwll.ch>
+Cc: Peter Frühberger <peter.fruehberger@gmail.com>
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Jani Nikula <jani.nikula@intel.com>
+Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
+---
+ drivers/gpu/drm/i915/i915_irq.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -1829,7 +1829,7 @@ static irqreturn_t cherryview_irq_handle
+ 	/* IRQs are synced during runtime_suspend, we don't require a wakeref */
+ 	disable_rpm_wakeref_asserts(dev_priv);
+ 
+-	do {
++	for (;;) {
+ 		master_ctl = I915_READ(GEN8_MASTER_IRQ) & ~GEN8_MASTER_IRQ_CONTROL;
+ 		iir = I915_READ(VLV_IIR);
+ 
+@@ -1857,7 +1857,7 @@ static irqreturn_t cherryview_irq_handle
+ 
+ 		I915_WRITE(GEN8_MASTER_IRQ, DE_MASTER_IRQ_CONTROL);
+ 		POSTING_READ(GEN8_MASTER_IRQ);
+-	} while (0);
++	}
+ 
+ 	enable_rpm_wakeref_asserts(dev_priv);
+ 
diff --git a/queue-4.6/series b/queue-4.6/series
index 050bff07f0c..054970e33aa 100644
--- a/queue-4.6/series
+++ b/queue-4.6/series
@@ -78,3 +78,4 @@ netfilter-x_tables-check-standard-target-size-too.patch
 netfilter-x_tables-check-for-bogus-target-offset.patch
 netfilter-x_tables-validate-all-offsets-and-sizes-in-a-rule.patch
 netfilter-x_tables-don-t-reject-valid-target-size-on-some-architectures.patch
+revert-drm-i915-exit-cherryview_irq_handler-after-one-pass.patch