xf86-video-intel: 2 commits - src/compat-api.h src/intel_driver.c src/sna/sna_accel.c src/sna/sna_dri.c src/sna/sna_driver.c

[Chris Wilson]

 src/compat-api.h     |    6 ------
 src/intel_driver.c   |    1 -
 src/sna/sna_accel.c  |    2 +-
 src/sna/sna_dri.c    |    4 ++--
 src/sna/sna_driver.c |    1 -
 5 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit eb667378543f97d7c7e7767daddbd9b39e07c1f8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 26 15:12:57 2012 +0100

    sna: Typo in DBG
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 5e3280e..7f64741 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2571,7 +2571,7 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
 	int16_t dx, dy;
 	int ret;
 
-	DBG(("%s pixmap=%ld, box=((%d, %d), (%d, %d)), flagss=%x...\n",
+	DBG(("%s pixmap=%ld, box=((%d, %d), (%d, %d)), flags=%x...\n",
 	     __FUNCTION__,
 	     pixmap->drawable.serialNumber,
 	     box->x1, box->y1, box->x2, box->y2,
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index a59580b..88dec3a 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -1373,8 +1373,8 @@ static void sna_dri_flip_event(struct sna *sna,
 	/* We assume our flips arrive in order, so we don't check the frame */
 	switch (flip->type) {
 	case DRI2_FLIP:
-		DBG(("%s: flip complete (drawable gone? %d)\n"
-		     , __FUNCTION__, flp->draw == NULL));
+		DBG(("%s: flip complete (drawable gone? %d)\n",
+		     __FUNCTION__, flip->draw == NULL));
 		if (flip->draw)
 			DRI2SwapComplete(flip->client, flip->draw,
 					 flip->fe_frame,
commit 557ad78d02dfff3db9e7fc21f05230a8fe482f7c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 26 15:02:17 2012 +0100

    Kill mibstore pretend backwards compatibility
    
    Adam Jackson was kind enough to point out that mibstore had been a no-op
    since xorg-1.4 and the earliest we claim to support is xorg-1.6.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/compat-api.h b/src/compat-api.h
index 9ca2ab3..6b76572 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -103,10 +103,4 @@
 
 #endif
 
-#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(13, 0)
-#define miInitializeBackingStore(x) do {} while (0)
-#else
-#include "mibstore.h"
-#endif
-
 #endif
diff --git a/src/intel_driver.c b/src/intel_driver.c
index ec887aa..f338a36 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -960,7 +960,6 @@ I830ScreenInit(SCREEN_INIT_ARGS_DECL)
 		return FALSE;
 	}
 
-	miInitializeBackingStore(screen);
 	xf86SetBackingStore(screen);
 	xf86SetSilkenMouse(screen);
 	miDCInitialize(screen, xf86GetPointerScreenFuncs());
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 223387d..462d9ac 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -884,7 +884,6 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
 
 	xf86SetBlackWhitePixels(screen);
 
-	miInitializeBackingStore(screen);
 	xf86SetBackingStore(screen);
 	xf86SetSilkenMouse(screen);
 	if (!miDCInitialize(screen, xf86GetPointerScreenFuncs()))