no idea what happened here... maybe I lost a rebase on my scripts... will rebase or just remove for now Thanks On Tue, Nov 19, 2013 at 8:38 AM, Daniel Vetter <daniel@xxxxxxxx> wrote: > 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älä <ville.syrjala@xxxxxxxxxxxxxxx> >> > >> > 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älä <ville.syrjala@xxxxxxxxxxxxxxx> >> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> >> Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > 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 -- Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
