From b52c256b800fbb31335564b4e098f6544c8304ab Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 28 Jun 2016 03:31:04 +0100 Subject: [PATCH] linux: Drop 'drm/i915: Exit cherryview_irq_handler() after one pass' patch --- .../linux-030-BYT-CHT-SOC-audio-support.patch | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/projects/Generic/patches/linux/linux-030-BYT-CHT-SOC-audio-support.patch b/projects/Generic/patches/linux/linux-030-BYT-CHT-SOC-audio-support.patch index 8436f3f740..de6f16ffe9 100644 --- a/projects/Generic/patches/linux/linux-030-BYT-CHT-SOC-audio-support.patch +++ b/projects/Generic/patches/linux/linux-030-BYT-CHT-SOC-audio-support.patch @@ -1,39 +1,3 @@ -From 5f271ec35cf8b637227697d31e3fe66427955433 Mon Sep 17 00:00:00 2001 -From: Pierre-Louis Bossart -Date: Wed, 18 May 2016 10:58:01 -0500 -Subject: [PATCH 01/14] Revert "drm/i915: Exit cherryview_irq_handler() after - one pass" - -This reverts commit 9dbaab56ac09f07a73fe83bf69bec3e31060080a. - -Signed-off-by: Pierre-Louis Bossart ---- - drivers/gpu/drm/i915/i915_irq.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 1c21220..d1a46ef 100644 ---- 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_handler(int irq, void *arg) - /* 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_handler(int irq, void *arg) - - I915_WRITE(GEN8_MASTER_IRQ, DE_MASTER_IRQ_CONTROL); - POSTING_READ(GEN8_MASTER_IRQ); -- } while (0); -+ } - - enable_rpm_wakeref_asserts(dev_priv); - - From 09e9dd64f231da00bc01a7188ddf258cb6189958 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Wed, 2 Mar 2016 14:30:44 -0600