From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 18 Feb 2021 09:41:42 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v5.11.1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cebf6d92d851cf78a9ff5457bf07a88221b677c;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	revert-drm-i915-shut-up-gen8-sde-irq-dmesg-noise.patch
---

diff --git a/queue-4.4/revert-drm-i915-shut-up-gen8-sde-irq-dmesg-noise.patch b/queue-4.4/revert-drm-i915-shut-up-gen8-sde-irq-dmesg-noise.patch
new file mode 100644
index 00000000000..21f890d111c
--- /dev/null
+++ b/queue-4.4/revert-drm-i915-shut-up-gen8-sde-irq-dmesg-noise.patch
@@ -0,0 +1,52 @@
+From 820da7ae46332fa709b171eb7ba57cbd023fa6df Mon Sep 17 00:00:00 2001
+From: Jani Nikula <jani.nikula@intel.com>
+Date: Wed, 25 Nov 2015 16:47:23 +0200
+Subject: Revert "drm/i915: shut up gen8+ SDE irq dmesg noise"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Jani Nikula <jani.nikula@intel.com>
+
+commit 820da7ae46332fa709b171eb7ba57cbd023fa6df upstream.
+
+This reverts
+
+commit 97e5ed1111dcc5300a0f59a55248cd243937a8ab
+Author: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date:   Fri Oct 23 10:56:12 2015 +0200
+
+    drm/i915: shut up gen8+ SDE irq dmesg noise
+
+With the proper fix ("drm/i915: fix the SDE irq dmesg warnings
+properly") reliably in place, bring back the error message.
+
+Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
+Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/1448462843-32739-2-git-send-email-jani.nikula@intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/i915/i915_irq.c |   10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -2337,13 +2337,9 @@ static irqreturn_t gen8_irq_handler(int
+ 				spt_irq_handler(dev, pch_iir);
+ 			else
+ 				cpt_irq_handler(dev, pch_iir);
+-		} else {
+-			/*
+-			 * Like on previous PCH there seems to be something
+-			 * fishy going on with forwarding PCH interrupts.
+-			 */
+-			DRM_DEBUG_DRIVER("The master control interrupt lied (SDE)!\n");
+-		}
++		} else
++			DRM_ERROR("The master control interrupt lied (SDE)!\n");
++
+ 	}
+ 
+ 	I915_WRITE_FW(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);
diff --git a/queue-4.4/series b/queue-4.4/series
index 70fa4cb203a..f03e4821c77 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -22,3 +22,4 @@ x86-build-disable-cet-instrumentation-in-the-kernel-for-32-bit-too.patch
 trace-use-mcount-record-for-dynamic-ftrace.patch
 tracing-fix-skip_stack_validation-1-build-due-to-bad-merge-with-mrecord-mcount.patch
 tracing-avoid-calling-cc-option-mrecord-mcount-for-every-makefile.patch
+revert-drm-i915-shut-up-gen8-sde-irq-dmesg-noise.patch