From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ben Widawsky <ben@bwidawsk.net>
Subject: Re: [PATCH 09/12] drm/i915: timeout parameter for seqno
 wait
Date: Sat, 28 Apr 2012 12:34:41 -0700
Message-ID: <20120428123441.7f6e32f2@bwidawsk.net>
References: <1335481389-7232-1-git-send-email-ben@bwidawsk.net>
	<1335481389-7232-10-git-send-email-ben@bwidawsk.net>
	<1335536090_68865@CP5-2952>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from cloud01.chad-versace.us (184-106-247-128.static.cloud-ips.com
	[184.106.247.128])
	by gabe.freedesktop.org (Postfix) with ESMTP id 7F5429E789
	for <intel-gfx@lists.freedesktop.org>;
	Sat, 28 Apr 2012 12:36:13 -0700 (PDT)
In-Reply-To: <1335536090_68865@CP5-2952>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

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.