1 files changed, 0 insertions, 205 deletions

diff --git a/xorg-server/hw/xfree86/os-support/shared/vidmem.c b/xorg-server/hw/xfree86/os-support/shared/vidmem.c
index f473293c7..a6bf677f5 100644
--- a/xorg-server/hw/xfree86/os-support/shared/vidmem.c
+++ b/xorg-server/hw/xfree86/os-support/shared/vidmem.c
@@ -42,119 +42,7 @@
  * This file contains the common part of the video memory mapping functions
  */
 
-/*
- * Get a piece of the ScrnInfoRec.  At the moment, this is only used to hold
- * the MTRR option information, but it is likely to be expanded if we do
- * auto unmapping of memory at VT switch.
- *
- */
-
-typedef struct {
-    unsigned long size;
-    void *virtBase;
-    void *mtrrInfo;
-} MappingRec, *MappingPtr;
-
-typedef struct {
-    int numMappings;
-    MappingPtr *mappings;
-    Bool mtrrEnabled;
-    MessageType mtrrFrom;
-    Bool mtrrOptChecked;
-    ScrnInfoPtr pScrn;
-} VidMapRec, *VidMapPtr;
-
-static int vidMapIndex = -1;
-
-#define VIDMAPPTR(p) ((VidMapPtr)((p)->privates[vidMapIndex].ptr))
-
 static VidMemInfo vidMemInfo = { FALSE, };
-static VidMapRec vidMapRec = { 0, NULL, TRUE, X_DEFAULT, FALSE, NULL };
-
-static VidMapPtr
-getVidMapRec(int scrnIndex)
-{
-    VidMapPtr vp;
-    ScrnInfoPtr pScrn;
-
-    if ((scrnIndex < 0) || !(pScrn = xf86Screens[scrnIndex]))
-        return &vidMapRec;
-
-    if (vidMapIndex < 0)
-        vidMapIndex = xf86AllocateScrnInfoPrivateIndex();
-
-    if (VIDMAPPTR(pScrn) != NULL)
-        return VIDMAPPTR(pScrn);
-
-    vp = pScrn->privates[vidMapIndex].ptr = xnfcalloc(sizeof(VidMapRec), 1);
-    vp->mtrrEnabled = TRUE;     /* default to enabled */
-    vp->mtrrFrom = X_DEFAULT;
-    vp->mtrrOptChecked = FALSE;
-    vp->pScrn = pScrn;
-    return vp;
-}
-
-static MappingPtr
-newMapping(VidMapPtr vp)
-{
-    vp->mappings = xnfrealloc(vp->mappings, sizeof(MappingPtr) *
-                              (vp->numMappings + 1));
-    vp->mappings[vp->numMappings] = xnfcalloc(sizeof(MappingRec), 1);
-    return vp->mappings[vp->numMappings++];
-}
-
-static MappingPtr
-findMapping(VidMapPtr vp, void *vbase, unsigned long size)
-{
-    int i;
-
-    for (i = 0; i < vp->numMappings; i++) {
-        if (vp->mappings[i]->virtBase == vbase && vp->mappings[i]->size == size)
-            return vp->mappings[i];
-    }
-    return NULL;
-}
-
-static void
-removeMapping(VidMapPtr vp, MappingPtr mp)
-{
-    int i, found = 0;
-
-    for (i = 0; i < vp->numMappings; i++) {
-        if (vp->mappings[i] == mp) {
-            found = 1;
-            free(vp->mappings[i]);
-        }
-        else if (found) {
-            vp->mappings[i - 1] = vp->mappings[i];
-        }
-    }
-    vp->numMappings--;
-    vp->mappings[vp->numMappings] = NULL;
-}
-
-enum { OPTION_MTRR };
-
-static const OptionInfoRec opts[] = {
-    {OPTION_MTRR, "mtrr", OPTV_BOOLEAN, {0}, FALSE},
-    {-1, NULL, OPTV_NONE, {0}, FALSE}
-};
-
-static void
-checkMtrrOption(VidMapPtr vp)
-{
-    if (!vp->mtrrOptChecked && vp->pScrn && vp->pScrn->options != NULL) {
-        OptionInfoPtr options;
-
-        options = xnfalloc(sizeof(opts));
-        (void) memcpy(options, opts, sizeof(opts));
-        xf86ProcessOptions(vp->pScrn->scrnIndex, vp->pScrn->options, options);
-        if (xf86GetOptValBool(options, OPTION_MTRR, &vp->mtrrEnabled))
-            vp->mtrrFrom = X_CONFIG;
-        free(options);
-        vp->mtrrOptChecked = TRUE;
-    }
-}
 
 void
 xf86InitVidMem(void)
@@ -164,96 +52,3 @@ xf86InitVidMem(void)
         xf86OSInitVidMem(&vidMemInfo);
     }
 }
-
-void *
-xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
-{
-    void *vbase = NULL;
-    VidMapPtr vp;
-    MappingPtr mp;
-
-    if (((Flags & VIDMEM_FRAMEBUFFER) &&
-         (Flags & (VIDMEM_MMIO | VIDMEM_MMIO_32BIT))))
-        FatalError("Mapping memory with more than one type\n");
-
-    xf86InitVidMem();
-    if (!vidMemInfo.initialised || !vidMemInfo.mapMem)
-        return NULL;
-
-    vbase = vidMemInfo.mapMem(ScreenNum, Base, Size, Flags);
-
-    if (!vbase || vbase == (void *) -1)
-        return NULL;
-
-    vp = getVidMapRec(ScreenNum);
-    mp = newMapping(vp);
-    mp->size = Size;
-    mp->virtBase = vbase;
-
-    /*
-     * Check the "mtrr" option even when MTRR isn't supported to avoid
-     * warnings about unrecognised options.
-     */
-    checkMtrrOption(vp);
-
-    if (vp->mtrrEnabled && vidMemInfo.setWC) {
-        if (Flags & (VIDMEM_MMIO | VIDMEM_MMIO_32BIT))
-            mp->mtrrInfo =
-                vidMemInfo.setWC(ScreenNum, Base, Size, FALSE, vp->mtrrFrom);
-        else if (Flags & VIDMEM_FRAMEBUFFER)
-            mp->mtrrInfo =
-                vidMemInfo.setWC(ScreenNum, Base, Size, TRUE, vp->mtrrFrom);
-    }
-    return vbase;
-}
-
-void
-xf86UnMapVidMem(int ScreenNum, void *Base, unsigned long Size)
-{
-    VidMapPtr vp;
-    MappingPtr mp;
-
-    if (!vidMemInfo.initialised || !vidMemInfo.unmapMem) {
-        xf86DrvMsg(ScreenNum, X_WARNING,
-                   "xf86UnMapVidMem() called before xf86MapVidMem()\n");
-        return;
-    }
-
-    vp = getVidMapRec(ScreenNum);
-    mp = findMapping(vp, Base, Size);
-    if (!mp) {
-        xf86DrvMsg(ScreenNum, X_WARNING,
-                   "xf86UnMapVidMem: cannot find region for [%p,0x%lx]\n",
-                   Base, Size);
-        return;
-    }
-    if (vp->mtrrEnabled && vidMemInfo.undoWC && mp)
-        vidMemInfo.undoWC(ScreenNum, mp->mtrrInfo);
-
-    vidMemInfo.unmapMem(ScreenNum, Base, Size);
-    removeMapping(vp, mp);
-}
-
-Bool
-xf86CheckMTRR(int ScreenNum)
-{
-    VidMapPtr vp = getVidMapRec(ScreenNum);
-
-    /*
-     * Check the "mtrr" option even when MTRR isn't supported to avoid
-     * warnings about unrecognised options.
-     */
-    checkMtrrOption(vp);
-
-    if (vp->mtrrEnabled && vidMemInfo.setWC)
-        return TRUE;
-
-    return FALSE;
-}
-
-Bool
-xf86LinearVidMem(void)
-{
-    xf86InitVidMem();
-    return vidMemInfo.linearSupported;
-}