Nouveau - Mar 2013 - [PATCH v2] drm/nouveau: wait for vblank on page flipping

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
---
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);
 		if (ret) {
 			mutex_unlock(&chan->cli->mutex);
 			goto fail_unreserve;

On Thu, 2013-03-28 at 16:16 +0100, Maarten Lankhorst
wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
> ---
> 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;