From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Hurley Subject: Re: [PATCH v2] drm/nouveau: wait for vblank on page flipping Date: Thu, 28 Mar 2013 17:33:36 -0400 Message-ID: <1364506416.3559.51.camel@thor.lan> References: <51545EE3.8020406@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <51545EE3.8020406-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nouveau-bounces+gcfxn-nouveau=m.gmane.org-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Errors-To: nouveau-bounces+gcfxn-nouveau=m.gmane.org-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org To: Maarten Lankhorst Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, "dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" List-Id: nouveau.vger.kernel.org On Thu, 2013-03-28 at 16:16 +0100, Maarten Lankhorst wrote: > Signed-off-by: Maarten Lankhorst > --- > Oops, fixed to apply this time.. > > diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c > index 4610c3a..020542e 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_display.c > +++ b/drivers/gpu/drm/nouveau/nouveau_display.c > @@ -593,7 +597,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, > > /* Emit a page flip */ > if (nv_device(drm->device)->card_type >= NV_50) { > - ret = nv50_display_flip_next(crtc, fb, chan, 0); > + ret = nv50_display_flip_next(crtc, fb, chan, 1); Why would this work? > if (ret) { > mutex_unlock(&chan->cli->mutex); > goto fail_unreserve;