From 7ee73d2c6f373f3d6829cb1876b1940db62be452 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 14 May 2010 17:51:20 +0100 Subject: [PATCH] drm: Remove unused old_front parameter from drmmode_do_pageflip. Signed-off-by: Chris Wilson --- src/drmmode_display.c | 5 +---- src/i830.h | 2 +- src/i830_dri.c | 7 ++----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 66a2faf7..69f369ca 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1323,10 +1323,7 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height) } Bool -drmmode_do_pageflip(ScreenPtr screen, - dri_bo *old_front, - dri_bo *new_front, - void *data) +drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front, void *data) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; intel_screen_private *intel = intel_get_screen_private(scrn); diff --git a/src/i830.h b/src/i830.h index 3a2a620e..827655b3 100644 --- a/src/i830.h +++ b/src/i830.h @@ -395,7 +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 *old_front, dri_bo *new_front, void *data); +extern Bool drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front, void *data); static inline intel_screen_private * intel_get_screen_private(ScrnInfoPtr scrn) diff --git a/src/i830_dri.c b/src/i830_dri.c index 21871c59..7ba91661 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -487,7 +487,7 @@ I830DRI2ScheduleFlip(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back, DRI2SwapEventPtr func, void *data) { ScreenPtr screen = draw->pScreen; - I830DRI2BufferPrivatePtr front_priv, back_priv; + I830DRI2BufferPrivatePtr back_priv; DRI2FrameEventPtr flip_info; flip_info = xcalloc(1, sizeof(DRI2FrameEventRec)); @@ -500,12 +500,9 @@ I830DRI2ScheduleFlip(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, flip_info->event_complete = func; flip_info->event_data = data; - front_priv = front->driverPrivate; - back_priv = back->driverPrivate; - /* Page flip the full screen buffer */ + back_priv = back->driverPrivate; return drmmode_do_pageflip(screen, - i830_get_pixmap_bo(front_priv->pixmap), i830_get_pixmap_bo(back_priv->pixmap), flip_info); }