From: Ben Widawsky <ben@bwidawsk.net>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 09/12] drm/i915: timeout parameter for seqno wait
Date: Sat, 28 Apr 2012 12:34:41 -0700 [thread overview]
Message-ID: <20120428123441.7f6e32f2@bwidawsk.net> (raw)
In-Reply-To: <1335536090_68865@CP5-2952>
On Fri, 27 Apr 2012 15:14:10 +0100
Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Thu, 26 Apr 2012 16:03:06 -0700, Ben Widawsky <ben@bwidawsk.net>
> wrote:
> > static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno,
> > - bool interruptible)
> > + bool interruptible, long *usecs)
> > {
> > drm_i915_private_t *dev_priv = ring->dev->dev_private;
> > - int ret = 0;
> > + bool wait_forever = false;
> > + long timeout, end;
> > +
> > + if (usecs == NULL || ((*usecs) < 0)) {
> > + wait_forever = true;
> > + timeout = msecs_to_jiffies(100);
> > + } else
> > + timeout = usecs_to_jiffies(*usecs);
> > +
> > + if (i915_seqno_passed(ring->get_seqno(ring), seqno))
> > + return 0;
> > +
> > + if (WARN_ON(!ring->irq_get(ring)))
> > + return -ENODEV;
>
> Rebase error, duplicated ring->irq_get/ring->get_seqno.
> -Chris
>
Got it, thanks.
next prev parent reply other threads:[~2012-04-28 19:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-26 23:02 [PATCH 00/12 v2] wait for BO with timeout Ben Widawsky
2012-04-26 23:02 ` [PATCH 01/12 v2] drm/i915: remove do_retire from i915_wait_request Ben Widawsky
2012-04-27 14:25 ` Daniel Vetter
2012-04-26 23:02 ` [PATCH 02/12] drm/i915: remove some extra retiring Ben Widawsky
2012-04-27 14:21 ` Daniel Vetter
2012-04-26 23:03 ` [PATCH 03/12 v2] drm/i915: move vbetool invoked ier stuff Ben Widawsky
2012-04-27 14:28 ` Daniel Vetter
2012-05-04 19:40 ` Jesse Barnes
2012-04-26 23:03 ` [PATCH 04/12 v2] drm/i915: kill waiting_seqno Ben Widawsky
2012-04-27 14:45 ` Daniel Vetter
2012-04-26 23:03 ` [PATCH 05/12 v2] drm/i915: drop polled waits from i915_wait_request Ben Widawsky
2012-04-27 14:46 ` Daniel Vetter
2012-04-26 23:03 ` [PATCH 06/12 v2] drm/i915: extract __wait_seqno " Ben Widawsky
2012-04-26 23:03 ` [PATCH 07/12] drm/i915: remove polled wait from throttle Ben Widawsky
2012-04-26 23:03 ` [PATCH 08/12 v2] drm/i915: use __wait_seqno for ring throttle Ben Widawsky
2012-04-27 14:50 ` Daniel Vetter
2012-04-26 23:03 ` [PATCH 09/12] drm/i915: timeout parameter for seqno wait Ben Widawsky
2012-04-27 14:14 ` Chris Wilson
2012-04-28 19:34 ` Ben Widawsky [this message]
2012-04-27 15:00 ` Daniel Vetter
2012-04-28 4:28 ` Ben Widawsky
2012-04-26 23:03 ` [PATCH 10/12] drm/i915: extract some common olr+wedge code Ben Widawsky
2012-04-27 8:46 ` Chris Wilson
2012-04-28 22:06 ` Ben Widawsky
2012-04-26 23:03 ` [PATCH 11/12 v2] drm/i915: wait render timeout ioctl Ben Widawsky
2012-04-27 8:44 ` Chris Wilson
2012-04-28 22:18 ` Ben Widawsky
2012-04-27 15:24 ` Chris Wilson
2012-04-29 2:11 ` Ben Widawsky
2012-04-29 2:33 ` Ben Widawsky
2012-04-29 9:27 ` Chris Wilson
2012-04-26 23:03 ` [PATCH 12/12] drm/i915: s/i915_wait_reqest/i915_wait_seqno/g Ben Widawsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120428123441.7f6e32f2@bwidawsk.net \
--to=ben@bwidawsk.net \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox