Remove calls to miInitializeBackingStore() and includes of mibstore.h

mibstore.h defines miInitializeBackingStore() as an empty stub, and
goes away in xserver 1.14.

43 files changed, 3 insertions, 103 deletions

diff --git a/driver/xf86-video-apm/src/apm.h b/driver/xf86-video-apm/src/apm.h
index a3c06f859..365e5e20c 100644
--- a/driver/xf86-video-apm/src/apm.h
+++ b/driver/xf86-video-apm/src/apm.h
@@ -33,9 +33,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 /* I2C support */
 #include "xf86i2c.h"
 
diff --git a/driver/xf86-video-apm/src/apm_driver.c b/driver/xf86-video-apm/src/apm_driver.c
index e40e1c2fa..ece599e3e 100644
--- a/driver/xf86-video-apm/src/apm_driver.c
+++ b/driver/xf86-video-apm/src/apm_driver.c
@@ -1784,7 +1784,6 @@ ApmScreenInit(SCREEN_INIT_ARGS_DECL)
     }
 #endif
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-ark/src/ark_driver.c b/driver/xf86-video-ark/src/ark_driver.c
index b7c287c5c..65cfe844f 100644
--- a/driver/xf86-video-ark/src/ark_driver.c
+++ b/driver/xf86-video-ark/src/ark_driver.c
@@ -39,7 +39,6 @@
 #include "compiler.h"
 #include "mipointer.h"
 #include "micmap.h"
-#include "mibstore.h"
 #include "fb.h"
 #include "ark.h"
 
@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL)
 
 	fbPictureInit (pScreen, 0, 0);
 
-	miInitializeBackingStore(pScreen);
 	xf86SetBackingStore(pScreen);
 
 	if (!pARK->NoAccel) {
diff --git a/driver/xf86-video-ati/src/radeon_driver.c b/driver/xf86-video-ati/src/radeon_driver.c
index 2ed9ebf01..f9c676279 100644
--- a/driver/xf86-video-ati/src/radeon_driver.c
+++ b/driver/xf86-video-ati/src/radeon_driver.c
@@ -3759,7 +3759,6 @@ Bool RADEONScreenInit(SCREEN_INIT_ARGS_DECL)
     /* Backing store setup */
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
 		   "Initializing backing store\n");
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
 
     /* DRI finalisation */
diff --git a/driver/xf86-video-ati/src/radeon_kms.c b/driver/xf86-video-ati/src/radeon_kms.c
index c757e88b0..3d914c1ff 100644
--- a/driver/xf86-video-ati/src/radeon_kms.c
+++ b/driver/xf86-video-ati/src/radeon_kms.c
@@ -1039,7 +1039,6 @@ Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
     /* Backing store setup */
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
 		   "Initializing backing store\n");
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
 
 
diff --git a/driver/xf86-video-chips/src/ct_driver.c b/driver/xf86-video-chips/src/ct_driver.c
index 6f3a5d446..effbc6059 100644
--- a/driver/xf86-video-chips/src/ct_driver.c
+++ b/driver/xf86-video-chips/src/ct_driver.c
@@ -96,9 +96,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 /* All drivers using the mi banking wrapper need this */
 #ifdef HAVE_ISA
 #include "mibank.h"
@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
 	    pBankInfo = NULL;
 	    return FALSE;
 	}
-	miInitializeBackingStore(pScreen);
 	xf86SetBackingStore(pScreen);
 
 	/* Initialise cursor functions */
@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
 	    }
 	}
 	
-	miInitializeBackingStore(pScreen);
 	xf86SetBackingStore(pScreen);
 #ifdef ENABLE_SILKEN_MOUSE
 	xf86SetSilkenMouse(pScreen);
diff --git a/driver/xf86-video-cirrus/src/alp_driver.c b/driver/xf86-video-cirrus/src/alp_driver.c
index e38c6134e..36f20392a 100644
--- a/driver/xf86-video-cirrus/src/alp_driver.c
+++ b/driver/xf86-video-cirrus/src/alp_driver.c
@@ -39,9 +39,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 #include "micmap.h"
 
 /* Needed by the Shadow Framebuffer */
@@ -1617,8 +1614,6 @@ AlpScreenInit(SCREEN_INIT_ARGS_DECL)
 	if (init_picture)
 		fbPictureInit (pScreen, 0, 0);
     
-	miInitializeBackingStore(pScreen);
-
 	/*
 	 * Set initial black & white colourmap indices.
 	 */
diff --git a/driver/xf86-video-cirrus/src/lg_driver.c b/driver/xf86-video-cirrus/src/lg_driver.c
index 13f222d49..c20bbd0c9 100644
--- a/driver/xf86-video-cirrus/src/lg_driver.c
+++ b/driver/xf86-video-cirrus/src/lg_driver.c
@@ -46,9 +46,6 @@
 /* need this for inputInfo */
 #include "inputstr.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 #include "micmap.h"
 
 /* Needed by the Shadow Framebuffer */
@@ -1373,8 +1370,6 @@ LgScreenInit(SCREEN_INIT_ARGS_DECL)
 
 	fbPictureInit(pScreen, 0, 0);
 
-	miInitializeBackingStore(pScreen);
-
 	/*
 	 * Set initial black & white colourmap indices.
 	 */
diff --git a/driver/xf86-video-dummy/src/dummy_driver.c b/driver/xf86-video-dummy/src/dummy_driver.c
index 62066d69b..6062c39d2 100644
--- a/driver/xf86-video-dummy/src/dummy_driver.c
+++ b/driver/xf86-video-dummy/src/dummy_driver.c
@@ -14,9 +14,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 /* All drivers using the mi colormap manipulation need this */
 #include "micmap.h"
 
@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
 		   , lines - pScrn->virtualY);
     }
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 	
diff --git a/driver/xf86-video-geode/src/geode_driver.c b/driver/xf86-video-geode/src/geode_driver.c
index b27bfd597..9cd0af9b9 100644
--- a/driver/xf86-video-geode/src/geode_driver.c
+++ b/driver/xf86-video-geode/src/geode_driver.c
@@ -59,8 +59,6 @@
 /* Machine independent stuff */
 #include "mipointer.h"
 #include "micmap.h"
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
 #include "vgaHW.h"
 #include "vbe.h"
 
diff --git a/driver/xf86-video-geode/src/gx_driver.c b/driver/xf86-video-geode/src/gx_driver.c
index 5268f2969..7f44e19f7 100644
--- a/driver/xf86-video-geode/src/gx_driver.c
+++ b/driver/xf86-video-geode/src/gx_driver.c
@@ -1350,7 +1350,6 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL)
     if (!pGeode->NoAccel)
         GXAccelInit(pScrn);
 
-    miInitializeBackingStore(pScrn);
     xf86SetBackingStore(pScrn);
 
     /* Set up the soft cursor */
diff --git a/driver/xf86-video-geode/src/lx_driver.c b/driver/xf86-video-geode/src/lx_driver.c
index 6d7f37f60..146578ebc 100644
--- a/driver/xf86-video-geode/src/lx_driver.c
+++ b/driver/xf86-video-geode/src/lx_driver.c
@@ -932,7 +932,6 @@ LXScreenInit(SCREEN_INIT_ARGS_DECL)
     if (!pGeode->NoAccel)
         pGeode->NoAccel = LXExaInit(pScrn) ? FALSE : TRUE;
 
-    miInitializeBackingStore(pScrn);
     xf86SetBackingStore(pScrn);
 
     /* Set up the soft cursor */
diff --git a/driver/xf86-video-glint/src/glint_driver.c b/driver/xf86-video-glint/src/glint_driver.c
index b6d20a914..aa78516ca 100644
--- a/driver/xf86-video-glint/src/glint_driver.c
+++ b/driver/xf86-video-glint/src/glint_driver.c
@@ -52,8 +52,6 @@
 #include "compiler.h"
 #include "mipointer.h"
 
-#include "mibstore.h"
-
 #include "pm3_regs.h"
 #include "glint_regs.h"
 #include "IBM.h"
@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL)
         }
     }
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-i128/src/i128_driver.c b/driver/xf86-video-i128/src/i128_driver.c
index 66fdee0a9..a4331a586 100644
--- a/driver/xf86-video-i128/src/i128_driver.c
+++ b/driver/xf86-video-i128/src/i128_driver.c
@@ -50,8 +50,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
 #include "micmap.h"
 
 #include "xf86DDC.h"
@@ -1557,7 +1555,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
         return FALSE;
     }
     
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-i740/src/i740_driver.c b/driver/xf86-video-i740/src/i740_driver.c
index 1c8219885..7c1051d5b 100644
--- a/driver/xf86-video-i740/src/i740_driver.c
+++ b/driver/xf86-video-i740/src/i740_driver.c
@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "compiler.h"
 
-/* Drivers using the mi implementation of backing store need: */
-
-#include "mibstore.h"
-
 /* All drivers using the vgahw module need this */
 /* This driver needs to be modified to not use vgaHW for multihead operation */
 #include "vgaHW.h"
@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
     }
   }
 
-  miInitializeBackingStore(pScreen);
   xf86SetBackingStore(pScreen);
   xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-neomagic/src/neo_driver.c b/driver/xf86-video-neomagic/src/neo_driver.c
index d7369e2cb..6a06047ad 100644
--- a/driver/xf86-video-neomagic/src/neo_driver.c
+++ b/driver/xf86-video-neomagic/src/neo_driver.c
@@ -72,9 +72,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 /* All drivers using the mi colormap manipulation need this */
 #include "micmap.h"
 
@@ -1621,7 +1618,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
                    "Acceleration %s Initialized\n",ret ? "" : "not");
     } 
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-nv/src/g80_driver.c b/driver/xf86-video-nv/src/g80_driver.c
index cc4e197e2..719b96c27 100644
--- a/driver/xf86-video-nv/src/g80_driver.c
+++ b/driver/xf86-video-nv/src/g80_driver.c
@@ -34,7 +34,6 @@
 #include <xf86Resources.h>
 #endif
 #include <mipointer.h>
-#include <mibstore.h>
 #include <micmap.h>
 #include <xf86cmap.h>
 #include <fb.h>
@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
         }
     }
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-nv/src/nv_driver.c b/driver/xf86-video-nv/src/nv_driver.c
index ceb6d2ebe..a8cf55510 100644
--- a/driver/xf86-video-nv/src/nv_driver.c
+++ b/driver/xf86-video-nv/src/nv_driver.c
@@ -2554,7 +2554,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
     if (!pNv->NoAccel)
 	NVAccelInit(pScreen);
     
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-nv/src/nv_include.h b/driver/xf86-video-nv/src/nv_include.h
index fb190bf99..f174eef74 100644
--- a/driver/xf86-video-nv/src/nv_include.h
+++ b/driver/xf86-video-nv/src/nv_include.h
@@ -24,9 +24,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 #include "micmap.h"
 
 #include "xf86DDC.h"
diff --git a/driver/xf86-video-nv/src/riva_driver.c b/driver/xf86-video-nv/src/riva_driver.c
index e0667ef47..759501e13 100644
--- a/driver/xf86-video-nv/src/riva_driver.c
+++ b/driver/xf86-video-nv/src/riva_driver.c
@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
     if (!pRiva->NoAccel)
 	RivaAccelInit(pScreen);
     
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-nv/src/riva_include.h b/driver/xf86-video-nv/src/riva_include.h
index f2c5302b6..c7aeef7b5 100644
--- a/driver/xf86-video-nv/src/riva_include.h
+++ b/driver/xf86-video-nv/src/riva_include.h
@@ -22,9 +22,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 #include "micmap.h"
 
 #include "xf86DDC.h"
diff --git a/driver/xf86-video-openchrome/src/via_driver.c b/driver/xf86-video-openchrome/src/via_driver.c
index 12dd0030e..94ccc89c6 100644
--- a/driver/xf86-video-openchrome/src/via_driver.c
+++ b/driver/xf86-video-openchrome/src/via_driver.c
@@ -2858,7 +2858,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
         viaInitAccel(pScreen);
     }
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
 #if 0
     xf86SetSilkenMouse(pScreen);
diff --git a/driver/xf86-video-r128/src/r128_driver.c b/driver/xf86-video-r128/src/r128_driver.c
index f75253921..cc7a5fbd3 100644
--- a/driver/xf86-video-r128/src/r128_driver.c
+++ b/driver/xf86-video-r128/src/r128_driver.c
@@ -2701,7 +2701,6 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
     R128DGAInit(pScreen);
 
 				/* Backing store setup */
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
 
 				/* Set Silken Mouse */
diff --git a/driver/xf86-video-radeonold/src/radeon_driver.c b/driver/xf86-video-radeonold/src/radeon_driver.c
index 4c34863ed..809a45e60 100644
--- a/driver/xf86-video-radeonold/src/radeon_driver.c
+++ b/driver/xf86-video-radeonold/src/radeon_driver.c
@@ -3653,7 +3653,6 @@ Bool RADEONScreenInit(SCREEN_INIT_ARGS_DECL)
     /* Backing store setup */
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
 		   "Initializing backing store\n");
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
 
     /* DRI finalisation */
diff --git a/driver/xf86-video-rendition/src/rendition.c b/driver/xf86-video-rendition/src/rendition.c
index 7c74f76be..888bb4ac1 100644
--- a/driver/xf86-video-rendition/src/rendition.c
+++ b/driver/xf86-video-rendition/src/rendition.c
@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DECL)
     fbPictureInit (pScreen, 0, 0);
 
     xf86SetBlackWhitePixels(pScreen);
-    miInitializeBackingStore(pScreen);
    
     /*********************************************************/
     /* The actual setup of the driver-specific code          */
diff --git a/driver/xf86-video-rendition/src/rendition.h b/driver/xf86-video-rendition/src/rendition.h
index f7f13d4a3..297117eeb 100644
--- a/driver/xf86-video-rendition/src/rendition.h
+++ b/driver/xf86-video-rendition/src/rendition.h
@@ -28,9 +28,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 /* All drivers using the mi colormap manipulation need this */
 #include "micmap.h"
 
diff --git a/driver/xf86-video-s3/src/s3_driver.c b/driver/xf86-video-s3/src/s3_driver.c
index 61242ad7b..85763bab5 100644
--- a/driver/xf86-video-s3/src/s3_driver.c
+++ b/driver/xf86-video-s3/src/s3_driver.c
@@ -52,7 +52,6 @@
 #include "compiler.h"
 #include "mipointer.h"
 #include "micmap.h"
-#include "mibstore.h"
 #include "fb.h"
 #include "inputstr.h"
 #include "shadowfb.h"
@@ -822,7 +821,6 @@ static Bool S3ScreenInit(SCREEN_INIT_ARGS_DECL)
 	fbPictureInit (pScreen, 0, 0);
 	S3DGAInit(pScreen);
 
-        miInitializeBackingStore(pScreen);
         xf86SetBackingStore(pScreen);
 
 	/* framebuffer manager setup */
diff --git a/driver/xf86-video-s3virge/src/s3v_driver.c b/driver/xf86-video-s3virge/src/s3v_driver.c
index 654884c00..e2800bf93 100644
--- a/driver/xf86-video-s3virge/src/s3v_driver.c
+++ b/driver/xf86-video-s3virge/src/s3v_driver.c
@@ -2420,7 +2420,6 @@ S3VScreenInit(SCREEN_INIT_ARGS_DECL)
         return FALSE;
   }
 	
-  miInitializeBackingStore(pScreen);
   xf86SetBackingStore(pScreen);
   xf86SetSilkenMouse(pScreen);
   						/* hardware cursor needs to wrap this layer */
diff --git a/driver/xf86-video-savage/src/savage_driver.c b/driver/xf86-video-savage/src/savage_driver.c
index e4e29fe06..91855057a 100644
--- a/driver/xf86-video-savage/src/savage_driver.c
+++ b/driver/xf86-video-savage/src/savage_driver.c
@@ -3408,7 +3408,6 @@ static Bool SavageScreenInit(SCREEN_INIT_ARGS_DECL)
 	SavageInitAccel(pScreen);
     }
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
 
     if( !psav->shadowFB && !psav->useEXA )
diff --git a/driver/xf86-video-siliconmotion/src/smi_driver.c b/driver/xf86-video-siliconmotion/src/smi_driver.c
index 4794571a0..134db7961 100644
--- a/driver/xf86-video-siliconmotion/src/smi_driver.c
+++ b/driver/xf86-video-siliconmotion/src/smi_driver.c
@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
 		   "Done writing mode.  Register dump:\n");
     SMI_PrintRegs(pScrn);
 
-    miInitializeBackingStore(pScreen);
-
 #ifdef HAVE_XMODES
     xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset));
 #endif
diff --git a/driver/xf86-video-sis/src/sis_driver.c b/driver/xf86-video-sis/src/sis_driver.c
index 61e807539..fdbea4a91 100644
--- a/driver/xf86-video-sis/src/sis_driver.c
+++ b/driver/xf86-video-sis/src/sis_driver.c
@@ -57,7 +57,6 @@
 #include "fb.h"
 #include "micmap.h"
 #include "mipointer.h"
-#include "mibstore.h"
 #include "edid.h"
 
 #define SIS_NEED_inSISREG
@@ -8859,7 +8858,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
     }
     pSiS->SiSFastVidCopyDone = TRUE;
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-sunffb/src/ffb_driver.c b/driver/xf86-video-sunffb/src/ffb_driver.c
index ec9e35225..89d4b60d5 100644
--- a/driver/xf86-video-sunffb/src/ffb_driver.c
+++ b/driver/xf86-video-sunffb/src/ffb_driver.c
@@ -30,7 +30,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "mipointer.h"
-#include "mibstore.h"
 #include "micmap.h"
 #include "fb.h"
 
@@ -761,8 +760,6 @@ FFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	xf86Msg(X_INFO, "%s: Using acceleration\n", pFfb->psdp->device);
     }
 
-
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-tdfx/src/tdfx_driver.c b/driver/xf86-video-tdfx/src/tdfx_driver.c
index ddd54311c..412da072f 100644
--- a/driver/xf86-video-tdfx/src/tdfx_driver.c
+++ b/driver/xf86-video-tdfx/src/tdfx_driver.c
@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "compiler.h"
 
-/* Drivers using the mi implementation of backing store need: */
-
-#include "mibstore.h"
-
 /* All drivers using the vgahw module need this */
 /* This driver needs to be modified to not use vgaHW for multihead operation */
 #include "vgaHW.h"
@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
     }
   }
 
-  miInitializeBackingStore(pScreen);
   xf86SetBackingStore(pScreen);
   xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-trident/src/trident_driver.c b/driver/xf86-video-trident/src/trident_driver.c
index dc12b761f..408c87052 100644
--- a/driver/xf86-video-trident/src/trident_driver.c
+++ b/driver/xf86-video-trident/src/trident_driver.c
@@ -56,7 +56,6 @@
 
 #include "mipointer.h"
 
-#include "mibstore.h"
 #include "shadow.h"
 #include "trident.h"
 #include "trident_regs.h"
@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL)
     	TridentAccelInit(pScreen);
     }
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
 
     /* Initialise cursor functions */
diff --git a/driver/xf86-video-tseng/src/tseng_driver.c b/driver/xf86-video-tseng/src/tseng_driver.c
index ffafb198e..0db62e5e1 100644
--- a/driver/xf86-video-tseng/src/tseng_driver.c
+++ b/driver/xf86-video-tseng/src/tseng_driver.c
@@ -39,9 +39,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 #include "fb.h"
 
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
@@ -1453,7 +1450,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL)
 	}
     }
 
-    miInitializeBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
     /* Initialise cursor functions */
     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
diff --git a/driver/xf86-video-vesa/src/vesa.c b/driver/xf86-video-vesa/src/vesa.c
index 4f1d9b25b..72942dd94 100644
--- a/driver/xf86-video-vesa/src/vesa.c
+++ b/driver/xf86-video-vesa/src/vesa.c
@@ -49,9 +49,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 /* Colormap handling */
 #include "micmap.h"
 #include "xf86cmap.h"
@@ -1083,7 +1080,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
     VESADGAInit(pScrn, pScreen);
 
     xf86SetBlackWhitePixels(pScreen);
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
 
     /* software cursor */
diff --git a/driver/xf86-video-vmware/saa/saa_priv.h b/driver/xf86-video-vmware/saa/saa_priv.h
index 66520547b..5d814530e 100644
--- a/driver/xf86-video-vmware/saa/saa_priv.h
+++ b/driver/xf86-video-vmware/saa/saa_priv.h
@@ -48,7 +48,6 @@
 #include "pixmapstr.h"
 #include "windowstr.h"
 #include "servermd.h"
-#include "mibstore.h"
 #include "colormapst.h"
 #include "gcstruct.h"
 #include "input.h"
diff --git a/driver/xf86-video-vmware/src/vmware.c b/driver/xf86-video-vmware/src/vmware.c
index 41201f16e..6b74e14aa 100644
--- a/driver/xf86-video-vmware/src/vmware.c
+++ b/driver/xf86-video-vmware/src/vmware.c
@@ -23,7 +23,6 @@ char rcsId_vmware[] =
 #include "xf86Pci.h"		/* pci */
 
 #include "mipointer.h"		/* sw cursor */
-#include "mibstore.h"		/* backing store */
 #include "micmap.h"		/* mi color map */
 #include "vgaHW.h"		/* VGA hardware */
 #include "fb.h"
@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
      * If backing store is to be supported (as is usually the case),
      * initialise it.
      */
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff --git a/driver/xf86-video-vmware/vmwgfx/vmwgfx_driver.c b/driver/xf86-video-vmware/vmwgfx/vmwgfx_driver.c
index 9959ffb84..7863ba213 100644
--- a/driver/xf86-video-vmware/vmwgfx/vmwgfx_driver.c
+++ b/driver/xf86-video-vmware/vmwgfx/vmwgfx_driver.c
@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
 		   (ms->only_hw_presents) ? "enabled" : "disabled");
     }
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
diff --git a/driver/xf86-video-voodoo/src/voodoo_driver.c b/driver/xf86-video-voodoo/src/voodoo_driver.c
index 6ef12aede..04b6d9ce5 100644
--- a/driver/xf86-video-voodoo/src/voodoo_driver.c
+++ b/driver/xf86-video-voodoo/src/voodoo_driver.c
@@ -680,7 +680,6 @@ VoodooScreenInit(SCREEN_INIT_ARGS_DECL)
   if(pVoo->Accel)
   	Voodoo2XAAInit(pScreen);
 
-  miInitializeBackingStore(pScreen);
   xf86SetBackingStore(pScreen);
   
 
diff --git a/driver/xf86-video-wildcatfb/src/wildcatfb_driver.c b/driver/xf86-video-wildcatfb/src/wildcatfb_driver.c
index 079a91d5d..03a0eab87 100644
--- a/driver/xf86-video-wildcatfb/src/wildcatfb_driver.c
+++ b/driver/xf86-video-wildcatfb/src/wildcatfb_driver.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wildcatfb_driver.c,v 1.10 2012/09/09 12:33:12 matthieu Exp $	*/
+/*	$OpenBSD: wildcatfb_driver.c,v 1.11 2013/05/12 13:06:25 matthieu Exp $	*/
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -95,7 +95,6 @@
 #include "xf86_OSproc.h"
 
 #include "mipointer.h"
-#include "mibstore.h"
 #include "micmap.h"
 #include "colormapst.h"
 #include "xf86cmap.h"
@@ -700,7 +699,6 @@ WildcatFBScreenInit(SCREEN_INIT_ARGS_DECL)
 	}
 
 	xf86SetBlackWhitePixels(pScreen);
-	miInitializeBackingStore(pScreen);
 	xf86SetBackingStore(pScreen);
 
 	/* Software cursor. */
diff --git a/driver/xf86-video-wsfb/src/wsfb_driver.c b/driver/xf86-video-wsfb/src/wsfb_driver.c
index b15615988..752b1c14c 100644
--- a/driver/xf86-video-wsfb/src/wsfb_driver.c
+++ b/driver/xf86-video-wsfb/src/wsfb_driver.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsfb_driver.c,v 1.28 2012/09/09 09:47:36 matthieu Exp $ */
+/* $OpenBSD: wsfb_driver.c,v 1.29 2013/05/12 13:06:25 matthieu Exp $ */
 /*
  * Copyright © 2001-2012 Matthieu Herrb
  * All rights reserved.
@@ -54,7 +54,6 @@
 #include "xf86_OSproc.h"
 
 #include "mipointer.h"
-#include "mibstore.h"
 #include "micmap.h"
 #include "colormapst.h"
 #include "xf86cmap.h"
@@ -1009,7 +1008,6 @@ WsfbScreenInit(SCREEN_INIT_ARGS_DECL)
 	}
 
 	xf86SetBlackWhitePixels(pScreen);
-	miInitializeBackingStore(pScreen);
 	xf86SetBackingStore(pScreen);
 
 	/* Software cursor. */
diff --git a/driver/xf86-video-wsudl/src/wsudl_driver.c b/driver/xf86-video-wsudl/src/wsudl_driver.c
index a6c6276e0..7d2fa4a55 100644
--- a/driver/xf86-video-wsudl/src/wsudl_driver.c
+++ b/driver/xf86-video-wsudl/src/wsudl_driver.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsudl_driver.c,v 1.9 2012/09/09 11:42:57 matthieu Exp $ */
+/*	$OpenBSD: wsudl_driver.c,v 1.10 2013/05/12 13:06:25 matthieu Exp $ */
 
 /*
  * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
@@ -70,7 +70,6 @@
 #include "xf86_OSproc.h"
 
 #include "mipointer.h"
-#include "mibstore.h"
 #include "micmap.h"
 #include "colormapst.h"
 #include "xf86cmap.h"
@@ -645,7 +644,6 @@ WsudlScreenInit(SCREEN_INIT_ARGS_DECL)
 	}
 
 	xf86SetBlackWhitePixels(pScreen);
-	miInitializeBackingStore(pScreen);
 	xf86SetBackingStore(pScreen);
 
 	/* software cursor */