Attachment 80082 Details for Bug 65197 – drop the WARN

[patch] drop the WARN

0001-drm-i915-rip-out-the-PM_IIR-WARN-again.patch (text/plain), 1.78 KB, created by Daniel Vetter on 2013-05-31 07:12:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-05-31 07:12:54 UTC

Size: 1.78 KB

patch

obsolete

>From 25d0735bc45fe4a69f01b5086c44d08a583dd64d Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Fri, 31 May 2013 09:09:00 +0200
>Subject: [PATCH] drm/i915: rip out the PM_IIR WARN, again
>
>This has accidentally been reintroduced with
>
>commit 22aae764a3fa21ee502b99e8986cb4e49ec14cfe
>Author:     Ben Widawsky <ben@bwidawsk.net>
>Date: Tue May 28 19:22:24 2013 -0700
>
>    drm/i915: Create a more generic pm handler for hsw+
>
>See
>
>commit 58bf8062d0b293b8e1028e5b0342082002886bd4
>Author: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date:   Thu Jun 21 14:55:22 2012 +0200
>
>    drm/i915: rip out the PM_IIR WARN
>
>for the extensive reasoning why the WARN is bogus.
>
>Cc: Damien Lespiau <damien.lespiau@intel.com>
>Cc: Ben Widawsky <ben@bwidawsk.net>
>Cc: Chris Wilson <chris@chris-wilson.co.uk>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65197
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_irq.c |    7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index da5c9ab..df85abc 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -934,11 +934,8 @@ static void hsw_pm_irq_handler(struct drm_i915_private *dev_priv,
> 
> 	spin_lock_irqsave(&dev_priv->rps.lock, flags);
> 	dev_priv->rps.pm_iir |= pm_iir & GEN6_PM_DEFERRED_EVENTS;
>-	if (dev_priv->rps.pm_iir) {
>-		I915_WRITE(GEN6_PMIMR, dev_priv->rps.pm_iir);
>-		/* never want to mask useful interrupts. (also posting read) */
>-		WARN_ON(I915_READ_NOTRACE(GEN6_PMIMR) & ~GEN6_PM_DEFERRED_EVENTS);
>-	}
>+	I915_WRITE(GEN6_PMIMR, dev_priv->rps.pm_iir);
>+	POSTING_READ(GEN6_PMIMR);
> 	spin_unlock_irqrestore(&dev_priv->rps.lock, flags);
> 
> 	queue_work(dev_priv->wq, &dev_priv->rps.work);
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 65197: 80082

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.