* [PATCH] drm/i915: fix user irq miss in BSD ring on g4x
@ 2011-05-16 8:02 Feng, Boqun
2011-05-16 10:27 ` Konstantin Belousov
2011-05-16 19:58 ` [Intel-gfx] " Keith Packard
0 siblings, 2 replies; 4+ messages in thread
From: Feng, Boqun @ 2011-05-16 8:02 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
On g4x, user interrupt in BSD ring is missed.
This is because though g4x and ironlake share the same bsd_ring,
their interrupt control interfaces have _two_ differences.
1.different irq enable/disable functions:
On g4x are i915_enable_irq and i915_disable_irq.
On ironlake are ironlake_enable_irq and ironlake_disable_irq.
2.different irq flag:
On g4x user interrupt flag in BSD ring on is I915_BSD_USER_INTERRUPT.
On ironlake is GT_BSD_USER_INTERRUPT
Old bsd_ring_get/put_irq call ring_get_irq and ring_get_irq.
ring_get_irq and ring_put_irq only call ironlake_enable/disable_irq.
So comes the irq miss on g4x.
To fix this, as other rings' code do, conditionally call different
functions(i915_enable/disable_irq and ironlake_enable/disable_irq)
and use different interrupt flags in bsd_ring_get/put_irq.
Signed-off-by: Feng, Boqun <boqun.feng@intel.com>
Reviewed-by: Xiang, Haihao <haihao.xiang@intel.com>
Cc: stable@kernel.org
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index e9e6f71..c4504a2 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -666,12 +666,37 @@ gen6_ring_put_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag)
static bool
bsd_ring_get_irq(struct intel_ring_buffer *ring)
{
- return ring_get_irq(ring, GT_BSD_USER_INTERRUPT);
+ struct drm_device *dev = ring->dev;
+ drm_i915_private_t *dev_priv = dev->dev_private;
+
+ if (!dev->irq_enabled)
+ return false;
+
+ spin_lock(&ring->irq_lock);
+ if (ring->irq_refcount++ == 0) {
+ if (IS_G4X(dev))
+ i915_enable_irq(dev_priv, I915_BSD_USER_INTERRUPT);
+ else
+ ironlake_enable_irq(dev_priv, GT_BSD_USER_INTERRUPT);
+ }
+ spin_unlock(&ring->irq_lock);
+
+ return true;
}
static void
bsd_ring_put_irq(struct intel_ring_buffer *ring)
{
- ring_put_irq(ring, GT_BSD_USER_INTERRUPT);
+ struct drm_device *dev = ring->dev;
+ drm_i915_private_t *dev_priv = dev->dev_private;
+
+ spin_lock(&ring->irq_lock);
+ if (--ring->irq_refcount == 0) {
+ if (IS_G4X(dev))
+ i915_disable_irq(dev_priv, I915_BSD_USER_INTERRUPT);
+ else
+ ironlake_disable_irq(dev_priv, GT_BSD_USER_INTERRUPT);
+ }
+ spin_unlock(&ring->irq_lock);
}
static int
--
1.7.4.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: fix user irq miss in BSD ring on g4x
2011-05-16 8:02 [PATCH] drm/i915: fix user irq miss in BSD ring on g4x Feng, Boqun
@ 2011-05-16 10:27 ` Konstantin Belousov
2011-05-16 19:53 ` Keith Packard
2011-05-16 19:58 ` [Intel-gfx] " Keith Packard
1 sibling, 1 reply; 4+ messages in thread
From: Konstantin Belousov @ 2011-05-16 10:27 UTC (permalink / raw)
To: Feng, Boqun; +Cc: intel-gfx, stable
[-- Attachment #1.1: Type: text/plain, Size: 1185 bytes --]
On Mon, May 16, 2011 at 04:02:39PM +0800, Feng, Boqun wrote:
> On g4x, user interrupt in BSD ring is missed.
> This is because though g4x and ironlake share the same bsd_ring,
> their interrupt control interfaces have _two_ differences.
>
> 1.different irq enable/disable functions:
> On g4x are i915_enable_irq and i915_disable_irq.
> On ironlake are ironlake_enable_irq and ironlake_disable_irq.
> 2.different irq flag:
> On g4x user interrupt flag in BSD ring on is I915_BSD_USER_INTERRUPT.
> On ironlake is GT_BSD_USER_INTERRUPT
>
> Old bsd_ring_get/put_irq call ring_get_irq and ring_get_irq.
> ring_get_irq and ring_put_irq only call ironlake_enable/disable_irq.
> So comes the irq miss on g4x.
>
> To fix this, as other rings' code do, conditionally call different
> functions(i915_enable/disable_irq and ironlake_enable/disable_irq)
> and use different interrupt flags in bsd_ring_get/put_irq.
>
> Signed-off-by: Feng, Boqun <boqun.feng@intel.com>
> Reviewed-by: Xiang, Haihao <haihao.xiang@intel.com>
> Cc: stable@kernel.org
It seems that the patch removes that last use for ring_get_irq() and
ring_put_irq() ? Are the helpers still needed ?
[-- Attachment #1.2: Type: application/pgp-signature, Size: 196 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: fix user irq miss in BSD ring on g4x
2011-05-16 10:27 ` Konstantin Belousov
@ 2011-05-16 19:53 ` Keith Packard
0 siblings, 0 replies; 4+ messages in thread
From: Keith Packard @ 2011-05-16 19:53 UTC (permalink / raw)
To: Konstantin Belousov, Feng, Boqun; +Cc: intel-gfx, stable
[-- Attachment #1.1: Type: text/plain, Size: 350 bytes --]
On Mon, 16 May 2011 13:27:27 +0300, Konstantin Belousov <kostikbel@gmail.com> wrote:
> It seems that the patch removes that last use for ring_get_irq() and
> ring_put_irq() ? Are the helpers still needed ?
You're right -- these helpers are no longer used and are removed in the
second patch in this sequence.
--
keith.packard@intel.com
[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: fix user irq miss in BSD ring on g4x
2011-05-16 8:02 [PATCH] drm/i915: fix user irq miss in BSD ring on g4x Feng, Boqun
2011-05-16 10:27 ` Konstantin Belousov
@ 2011-05-16 19:58 ` Keith Packard
1 sibling, 0 replies; 4+ messages in thread
From: Keith Packard @ 2011-05-16 19:58 UTC (permalink / raw)
To: intel-gfx; +Cc: Xiang, Haihao, Zou, Nanhai, Feng, Boqun, stable
[-- Attachment #1.1: Type: text/plain, Size: 304 bytes --]
On Mon, 16 May 2011 16:02:39 +0800, "Feng, Boqun" <boqun.feng@intel.com> wrote:
> On g4x, user interrupt in BSD ring is missed.
> This is because though g4x and ironlake share the same bsd_ring,
> their interrupt control interfaces have _two_ differences.
Merged.
--
keith.packard@intel.com
[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]
[-- Attachment #2: Type: text/plain, Size: 140 bytes --]
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-16 21:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-16 8:02 [PATCH] drm/i915: fix user irq miss in BSD ring on g4x Feng, Boqun
2011-05-16 10:27 ` Konstantin Belousov
2011-05-16 19:53 ` Keith Packard
2011-05-16 19:58 ` [Intel-gfx] " Keith Packard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.