From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 3/9] drm/i915: Use frame counter for
 intel_wait_for_vblank() on CTG
Date: Tue, 19 Nov 2013 17:38:13 +0100
Message-ID: <20131119163813.GD5794@phenom.ffwll.local>
References: <1384828358-31563-1-git-send-email-rodrigo.vivi@gmail.com>
	<1384828358-31563-4-git-send-email-rodrigo.vivi@gmail.com>
	<20131119134655.GA6173@nuc-i3427.alporthouse.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com [74.125.83.45])
	by gabe.freedesktop.org (Postfix) with ESMTP id EADB7FB4C4
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 19 Nov 2013 08:37:37 -0800 (PST)
Received: by mail-ee0-f45.google.com with SMTP id d49so3411219eek.18
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 19 Nov 2013 08:37:37 -0800 (PST)
Content-Disposition: inline
In-Reply-To: <20131119134655.GA6173@nuc-i3427.alporthouse.com>
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@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org
To: Chris Wilson <chris@chris-wilson.co.uk>, Rodrigo Vivi <rodrigo.vivi@gmail.com>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Tue, Nov 19, 2013 at 01:46:55PM +0000, Chris Wilson wrote:
> On Mon, Nov 18, 2013 at 06:32:32PM -0800, Rodrigo Vivi wrote:
> > From: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> > =

> > Use the same wait_for_vblank code for CTG that we use for ILK+.
> > =

> > Also fix the name of the frame counter register while at it.
> > =

> > Signed-off-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Already merged as 57e22f4add51b, apparently from a previous -collector
round (sinc it has your sob on it). Rebase gone wrong?
-Daniel
-- =

Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch