From e95395e26b75c62df812ef472d05d58c23aacf4d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 18 Feb 2021 15:07:56 +0100 Subject: [PATCH] drop queue-4.4/revert-drm-i915-shut-up-gen8-sde-irq-dmesg-noise.patch --- ...915-shut-up-gen8-sde-irq-dmesg-noise.patch | 52 ------------------- queue-4.4/series | 1 - 2 files changed, 53 deletions(-) delete mode 100644 queue-4.4/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 deleted file mode 100644 index 21f890d111c..00000000000 --- a/queue-4.4/revert-drm-i915-shut-up-gen8-sde-irq-dmesg-noise.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 820da7ae46332fa709b171eb7ba57cbd023fa6df Mon Sep 17 00:00:00 2001 -From: Jani Nikula -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 - -commit 820da7ae46332fa709b171eb7ba57cbd023fa6df upstream. - -This reverts - -commit 97e5ed1111dcc5300a0f59a55248cd243937a8ab -Author: Daniel Vetter -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 -Reviewed-by: Ville Syrjälä -Acked-by: Daniel Vetter -Signed-off-by: Jani Nikula -Link: http://patchwork.freedesktop.org/patch/msgid/1448462843-32739-2-git-send-email-jani.nikula@intel.com -Signed-off-by: Greg Kroah-Hartman ---- - 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 f03e4821c77..70fa4cb203a 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -22,4 +22,3 @@ 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 -- 2.47.2