* [PATCH] drm/i915: rip out the PM_IIR WARN, again
@ 2013-05-31 7:12 Daniel Vetter
2013-05-31 15:11 ` Damien Lespiau
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2013-05-31 7:12 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Ben Widawsky
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: rip out the PM_IIR WARN, again
2013-05-31 7:12 [PATCH] drm/i915: rip out the PM_IIR WARN, again Daniel Vetter
@ 2013-05-31 15:11 ` Damien Lespiau
2013-05-31 15:22 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Damien Lespiau @ 2013-05-31 15:11 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Intel Graphics Development, Ben Widawsky
On Fri, May 31, 2013 at 09:12:19AM +0200, Daniel Vetter wrote:
> 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(-)
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
There's a conflict with the rest of the VECS series, but fortunately
seems like an easy one.
--
Damien
>
> 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: rip out the PM_IIR WARN, again
2013-05-31 15:11 ` Damien Lespiau
@ 2013-05-31 15:22 ` Daniel Vetter
2013-05-31 17:21 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2013-05-31 15:22 UTC (permalink / raw)
To: Damien Lespiau; +Cc: Daniel Vetter, Intel Graphics Development, Ben Widawsky
On Fri, May 31, 2013 at 04:11:59PM +0100, Damien Lespiau wrote:
> On Fri, May 31, 2013 at 09:12:19AM +0200, Daniel Vetter wrote:
> > 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(-)
>
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
>
> There's a conflict with the rest of the VECS series, but fortunately
> seems like an easy one.
Queued for -next, thanks for the review.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: rip out the PM_IIR WARN, again
2013-05-31 15:22 ` Daniel Vetter
@ 2013-05-31 17:21 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2013-05-31 17:21 UTC (permalink / raw)
To: Damien Lespiau; +Cc: Daniel Vetter, Intel Graphics Development, Ben Widawsky
On Fri, May 31, 2013 at 05:22:07PM +0200, Daniel Vetter wrote:
> On Fri, May 31, 2013 at 04:11:59PM +0100, Damien Lespiau wrote:
> > On Fri, May 31, 2013 at 09:12:19AM +0200, Daniel Vetter wrote:
> > > 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(-)
> >
> > Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
> >
> > There's a conflict with the rest of the VECS series, but fortunately
> > seems like an easy one.
>
> Queued for -next, thanks for the review.
Patch dropped again since totally bogus.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-31 17:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-31 7:12 [PATCH] drm/i915: rip out the PM_IIR WARN, again Daniel Vetter
2013-05-31 15:11 ` Damien Lespiau
2013-05-31 15:22 ` Daniel Vetter
2013-05-31 17:21 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox