* [PATCH 2/2] drm/i915: Get VECS semaphore info on error
2013-08-12 23:53 [PATCH 1/2] drm/i915: Initialize seqno for VECS too Ben Widawsky
@ 2013-08-12 23:53 ` Ben Widawsky
2013-08-13 7:02 ` [PATCH 1/2] drm/i915: Initialize seqno for VECS too Daniel Vetter
2013-08-13 20:55 ` Ben Widawsky
2 siblings, 0 replies; 5+ messages in thread
From: Ben Widawsky @ 2013-08-12 23:53 UTC (permalink / raw)
To: intel-gfx; +Cc: Ben Widawsky, Mika Kuoppala, Ben Widawsky
Ideally we could use for_each_ring with the ring flags as I've done a
couple times
(http://lists.freedesktop.org/archives/intel-gfx/2013-June/029450.html).
Until Daniel merges that patch though, we can just use this.
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
drivers/gpu/drm/i915/i915_gpu_error.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 60393cb..558e568 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -243,6 +243,11 @@ static void i915_ring_error_state(struct drm_i915_error_state_buf *m,
err_printf(m, " SYNC_1: 0x%08x [last synced 0x%08x]\n",
error->semaphore_mboxes[ring][1],
error->semaphore_seqno[ring][1]);
+ if (HAS_VEBOX(dev)) {
+ err_printf(m, " SYNC_2: 0x%08x [last synced 0x%08x]\n",
+ error->semaphore_mboxes[ring][2],
+ error->semaphore_seqno[ring][2]);
+ }
}
err_printf(m, " seqno: 0x%08x\n", error->seqno[ring]);
err_printf(m, " waiting: %s\n", yesno(error->waiting[ring]));
@@ -682,6 +687,12 @@ static void i915_record_ring_state(struct drm_device *dev,
error->semaphore_seqno[ring->id][1] = ring->sync_seqno[1];
}
+ if (HAS_VEBOX(dev)) {
+ error->semaphore_mboxes[ring->id][2] =
+ I915_READ(RING_SYNC_2(ring->mmio_base));
+ error->semaphore_seqno[ring->id][2] = ring->sync_seqno[2];
+ }
+
if (INTEL_INFO(dev)->gen >= 4) {
error->faddr[ring->id] = I915_READ(RING_DMA_FADD(ring->mmio_base));
error->ipeir[ring->id] = I915_READ(RING_IPEIR(ring->mmio_base));
--
1.8.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] drm/i915: Initialize seqno for VECS too
2013-08-12 23:53 [PATCH 1/2] drm/i915: Initialize seqno for VECS too Ben Widawsky
2013-08-12 23:53 ` [PATCH 2/2] drm/i915: Get VECS semaphore info on error Ben Widawsky
@ 2013-08-13 7:02 ` Daniel Vetter
2013-08-13 20:55 ` Ben Widawsky
2 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2013-08-13 7:02 UTC (permalink / raw)
To: Ben Widawsky; +Cc: intel-gfx, Ben Widawsky, Mika Kuoppala
On Mon, Aug 12, 2013 at 04:53:03PM -0700, Ben Widawsky wrote:
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65387
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67198
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Tested-by: lu hua <huax.lu@intel.com> (both bug reports)
Please pimp the commit message as discussion on irc (reply with just the
text is ok). Strictly speaking we initialize the 3rd mbox for the 4th ring
here (which ofc is the vebox one for all rings != vebox). And also please
mention the effects of this bug, i.e. how it blows up.
Thanks, Daniel
> ---
> drivers/gpu/drm/i915/intel_ringbuffer.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 10c2aaa..665602f 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -1592,6 +1592,8 @@ void intel_ring_init_seqno(struct intel_ring_buffer *ring, u32 seqno)
> if (INTEL_INFO(ring->dev)->gen >= 6) {
> I915_WRITE(RING_SYNC_0(ring->mmio_base), 0);
> I915_WRITE(RING_SYNC_1(ring->mmio_base), 0);
> + if (HAS_VEBOX(ring->dev))
> + I915_WRITE(RING_SYNC_2(ring->mmio_base), 0);
> }
>
> ring->set_seqno(ring, seqno);
> --
> 1.8.3.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] drm/i915: Initialize seqno for VECS too
2013-08-12 23:53 [PATCH 1/2] drm/i915: Initialize seqno for VECS too Ben Widawsky
2013-08-12 23:53 ` [PATCH 2/2] drm/i915: Get VECS semaphore info on error Ben Widawsky
2013-08-13 7:02 ` [PATCH 1/2] drm/i915: Initialize seqno for VECS too Daniel Vetter
@ 2013-08-13 20:55 ` Ben Widawsky
2013-08-13 21:12 ` Daniel Vetter
2 siblings, 1 reply; 5+ messages in thread
From: Ben Widawsky @ 2013-08-13 20:55 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx, Mika Kuoppala
On Mon, Aug 12, 2013 at 04:53:03PM -0700, Ben Widawsky wrote:
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65387
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67198
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> ---
> drivers/gpu/drm/i915/intel_ringbuffer.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 10c2aaa..665602f 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -1592,6 +1592,8 @@ void intel_ring_init_seqno(struct intel_ring_buffer *ring, u32 seqno)
> if (INTEL_INFO(ring->dev)->gen >= 6) {
> I915_WRITE(RING_SYNC_0(ring->mmio_base), 0);
> I915_WRITE(RING_SYNC_1(ring->mmio_base), 0);
> + if (HAS_VEBOX(ring->dev))
> + I915_WRITE(RING_SYNC_2(ring->mmio_base), 0);
> }
>
> ring->set_seqno(ring, seqno);
We require n-1 mailboxes for proper semaphore synchronization. All
semaphore synchronization code relies on proper values in these
mailboxes. The fact that we failed to touch the vebox ring by itself was
unlikely to be an issue since the HW should be initializing the values
to 0. However the error framework for testing seqno wrap introduced by
Mika, in addition to the hangcheck via seqno, and
i915_error_first_batchbuffer() combined caused a nice explosion.
The problem is caused by seqno wrap because the wrap condition is not
properly setup. The wrap code attempts to set the sync mailboxes all to
0, and then set the current seqno to one less than 0. In all cases, the
vebox mailbox wasn't properly being initialized. This caused a wrap to
not occur. When hangcheck kicks in with the bogus seqno values, the rest
just doesn't work. It makes me wonder if we shouldn't consider a dumber
version of hangcheck...
How we messed this up:
VECS support was written before the aforementioned other features. Upon
VECS being rebased, these facts were missed.
--
Ben Widawsky, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] drm/i915: Initialize seqno for VECS too
2013-08-13 20:55 ` Ben Widawsky
@ 2013-08-13 21:12 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2013-08-13 21:12 UTC (permalink / raw)
To: Ben Widawsky; +Cc: intel-gfx, Mika Kuoppala
On Tue, Aug 13, 2013 at 01:55:36PM -0700, Ben Widawsky wrote:
> On Mon, Aug 12, 2013 at 04:53:03PM -0700, Ben Widawsky wrote:
> > Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65387
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67198
> > Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> > ---
> > drivers/gpu/drm/i915/intel_ringbuffer.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> > index 10c2aaa..665602f 100644
> > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> > @@ -1592,6 +1592,8 @@ void intel_ring_init_seqno(struct intel_ring_buffer *ring, u32 seqno)
> > if (INTEL_INFO(ring->dev)->gen >= 6) {
> > I915_WRITE(RING_SYNC_0(ring->mmio_base), 0);
> > I915_WRITE(RING_SYNC_1(ring->mmio_base), 0);
> > + if (HAS_VEBOX(ring->dev))
> > + I915_WRITE(RING_SYNC_2(ring->mmio_base), 0);
> > }
> >
> > ring->set_seqno(ring, seqno);
>
> We require n-1 mailboxes for proper semaphore synchronization. All
> semaphore synchronization code relies on proper values in these
> mailboxes. The fact that we failed to touch the vebox ring by itself was
> unlikely to be an issue since the HW should be initializing the values
> to 0. However the error framework for testing seqno wrap introduced by
> Mika, in addition to the hangcheck via seqno, and
> i915_error_first_batchbuffer() combined caused a nice explosion.
>
> The problem is caused by seqno wrap because the wrap condition is not
> properly setup. The wrap code attempts to set the sync mailboxes all to
> 0, and then set the current seqno to one less than 0. In all cases, the
> vebox mailbox wasn't properly being initialized. This caused a wrap to
> not occur. When hangcheck kicks in with the bogus seqno values, the rest
> just doesn't work. It makes me wonder if we shouldn't consider a dumber
> version of hangcheck...
>
> How we messed this up:
> VECS support was written before the aforementioned other features. Upon
> VECS being rebased, these facts were missed.
Both patches applied, thanks.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread