xf86-video-intel: src/drmmode_display.c src/i830.h

[Chris Wilson]

 src/drmmode_display.c |    5 +++--
 src/i830.h            |    3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 030d56279bf14d9ddd42d8fdbeaa66ef3f557b4d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri May 14 16:53:40 2010 +0100

    drm: don't overwrite the old intel->front_buffer
    
    It's now handled in the common ExchangeBuffers() path.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index d4cf367..66a2faf 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1323,7 +1323,9 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
 }
 
 Bool
-drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front, dri_bo *old_front,
+drmmode_do_pageflip(ScreenPtr screen,
+		    dri_bo *old_front,
+		    dri_bo *new_front,
 		    void *data)
 {
 	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
@@ -1374,7 +1376,6 @@ drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front, dri_bo *old_front,
 	dri_bo_pin(new_front, 0);
 	dri_bo_unpin(new_front);
 
-	intel->front_buffer = new_front;
 	drmmode->old_fb_id = old_fb_id;
 
 	return TRUE;
diff --git a/src/i830.h b/src/i830.h
index 9e1b4ca..3a2a620 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -395,8 +395,7 @@ enum {
 extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
 extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
 extern int drmmode_output_dpms_status(xf86OutputPtr output);
-extern Bool drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front,
-				dri_bo *old_front, void *data);
+extern Bool drmmode_do_pageflip(ScreenPtr screen, dri_bo *old_front, dri_bo *new_front, void *data);
 
 static inline intel_screen_private *
 intel_get_screen_private(ScrnInfoPtr scrn)