libxtrans xkeyboard-config xserver mesa plink glproto git update 21 Sep 2014

plink revision 10233
xserver          commit 28337cb14e4347e1dd7936c5393a22e042866687
xkeyboard-config commit 48e1c0b351b6711edc0f167cbb81e4424b75291a
glproto          commit bd3d751e1eb17efb39f65093271bb4ac071aa9e0
libxtrans        commit fb7f198c88e97d22c8c89e76e9cd06b2b2720a96
mesa             commit 4eb2bbefd2bf0359aff7ebbb8e931a1c7833606f

7 files changed, 3 insertions, 1448 deletions

diff --git a/xorg-server/hw/xfree86/os-support/bsd/Makefile.am b/xorg-server/hw/xfree86/os-support/bsd/Makefile.am
index 7133c0f21..b01ea5bca 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/Makefile.am
+++ b/xorg-server/hw/xfree86/os-support/bsd/Makefile.am
@@ -27,9 +27,7 @@ if ALPHA_VIDEO
 # Cheat here and piggyback other alpha bits on ALPHA_VIDEO.
 ARCH_SOURCES = \
 	alpha_video.c \
-	bsd_ev56.c \
-	bsd_axp.c \
-	$(srcdir)/../shared/xf86Axp.c
+	bsd_ev56.c
 endif
 
 if ARM_VIDEO
diff --git a/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c b/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c
index f656f5595..236def6ff 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c
@@ -35,11 +35,6 @@
 #ifndef __NetBSD__
 #include <sys/sysctl.h>
 #endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-#include <machine/sysarch.h>
-#endif
-
-#include "xf86Axp.h"
 
 #include "xf86_OSlib.h"
 #include "xf86OSpriv.h"
@@ -50,69 +45,9 @@
 #define MAP_FLAGS (MAP_FILE | MAP_SHARED)
 #endif
 
-axpDevice bsdGetAXP(void);
-
 #ifndef __NetBSD__
 extern unsigned long dense_base(void);
-
-static int axpSystem = -1;
-static unsigned long hae_thresh;
-static unsigned long hae_mask;
-
-static unsigned long
-memory_base(void)
-{
-    static unsigned long base = 0;
-
-    if (base == 0) {
-        size_t len = sizeof(base);
-        int error;
-
-#ifdef __OpenBSD__
-        int mib[3];
-
-        mib[0] = CTL_MACHDEP;
-        mib[1] = CPU_CHIPSET;
-        mib[2] = CPU_CHIPSET_MEM;
-
-        if ((error = sysctl(mib, 3, &base, &len, NULL, 0)) < 0)
-#else
-        if ((error = sysctlbyname("hw.chipset.memory", &base, &len, 0, 0)) < 0)
-#endif
-            FatalError("xf86MapVidMem: can't find memory\n");
-    }
-
-    return base;
-}
-
-static int
-has_bwx(void)
-{
-    static int bwx = 0;
-    size_t len = sizeof(bwx);
-    int error;
-
-#ifdef __OpenBSD__
-    int mib[3];
-
-    mib[0] = CTL_MACHDEP;
-    mib[1] = CPU_CHIPSET;
-    mib[2] = CPU_CHIPSET_BWX;
-
-    if ((error = sysctl(mib, 3, &bwx, &len, NULL, 0)) < 0)
-        return FALSE;
-    else
-        return bwx;
-#else
-    if ((error = sysctlbyname("hw.chipset.bwx", &bwx, &len, 0, 0)) < 0)
-        return FALSE;
-    else
-        return bwx;
-#endif
-}
 #else                           /* __NetBSD__ */
-static unsigned long hae_thresh = (1UL << 24);
-static unsigned long hae_mask = 0xf8000000UL;   /* XXX - should use xf86AXP.c */
 static struct alpha_bus_window *abw;
 static int abw_count = -1;
 
@@ -126,16 +61,6 @@ init_abw(void)
     }
 }
 
-static int
-has_bwx(void)
-{
-    if (abw_count < 0)
-        init_abw();
-
-    xf86Msg(X_INFO, "has_bwx = %d\n", abw[0].abw_abst.abst_flags & ABST_BWX ? 1 : 0);   /* XXXX */
-    return abw[0].abw_abst.abst_flags & ABST_BWX;
-}
-
 static unsigned long
 dense_base(void)
 {
@@ -147,30 +72,9 @@ dense_base(void)
     return abw[0].abw_abst.abst_sys_start;
 }
 
-static unsigned long
-memory_base(void)
-{
-    if (abw_count < 0)
-        init_abw();
-
-    if (abw_count > 1) {
-        xf86Msg(X_INFO, "memory base = %#lx\n", abw[1].abw_abst.abst_sys_start);        /* XXXX */
-        return abw[1].abw_abst.abst_sys_start;
-    }
-    else if (abw_count == 1) {
-        /* assume memory_base == dense_base */
-        xf86Msg(X_INFO, "memory base = %#lx\n", abw[0].abw_abst.abst_sys_start);        /* XXXX */
-        return abw[0].abw_abst.abst_sys_start;
-    }
-    else {
-        xf86Msg(X_INFO, "no memory base\n");    /* XXXX */
-        return 0;
-    }
-}
 #endif                          /* __NetBSD__ */
 
 #define BUS_BASE	dense_base()
-#define BUS_BASE_BWX	memory_base()
 
 /***************************************************************************/
 /* Video Memory Mapping section                                            */
@@ -182,18 +86,12 @@ memory_base(void)
                   "\trefer to xf86(4) for details"
 #endif
 
-static Bool useDevMem = FALSE;
 static int devMemFd = -1;
 
 #ifdef HAS_APERTURE_DRV
 #define DEV_APERTURE "/dev/xf86"
 #endif
 
-static void *mapVidMem(int, unsigned long, unsigned long, int);
-static void unmapVidMem(int, void *, unsigned long);
-static void *mapVidMemSparse(int, unsigned long, unsigned long, int);
-static void unmapVidMemSparse(int, void *, unsigned long);
-
 /*
  * Check if /dev/mem can be mmap'd.  If it can't print a warning when
  * "warn" is TRUE.
@@ -219,7 +117,6 @@ checkDevMem(Bool warn)
         if (base != MAP_FAILED) {
             munmap((caddr_t) base, 4096);
             devMemFd = fd;
-            useDevMem = TRUE;
             xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
                     DEV_APERTURE);
             return;
@@ -240,7 +137,6 @@ checkDevMem(Bool warn)
         if (base != MAP_FAILED) {
             munmap((caddr_t) base, 4096);
             devMemFd = fd;
-            useDevMem = TRUE;
             return;
         }
         else {
@@ -266,7 +162,6 @@ checkDevMem(Bool warn)
 #endif
         xf86ErrorF("\tlinear framebuffer access unavailable\n");
     }
-    useDevMem = FALSE;
     return;
 }
 
@@ -274,117 +169,10 @@ void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
     checkDevMem(TRUE);
-    pVidMem->linearSupported = useDevMem;
 
-    if (has_bwx()) {
-        xf86Msg(X_PROBED, "Machine type has 8/16 bit access\n");
-        pVidMem->mapMem = mapVidMem;
-        pVidMem->unmapMem = unmapVidMem;
-    }
-    else {
-        xf86Msg(X_PROBED, "Machine needs sparse mapping\n");
-        pVidMem->mapMem = mapVidMemSparse;
-        pVidMem->unmapMem = unmapVidMemSparse;
-#ifndef __NetBSD__
-        if (axpSystem == -1)
-            axpSystem = bsdGetAXP();
-        hae_thresh = xf86AXPParams[axpSystem].hae_thresh;
-        hae_mask = xf86AXPParams[axpSystem].hae_mask;
-#endif                          /* __NetBSD__ */
-    }
     pVidMem->initialised = TRUE;
 }
 
-static void *
-mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
-{
-    void *base;
-
-    checkDevMem(FALSE);
-    Base = Base & ((1L << 32) - 1);
-
-    if (useDevMem) {
-        if (devMemFd < 0) {
-            FatalError("xf86MapVidMem: failed to open %s (%s)\n",
-                       DEV_MEM, strerror(errno));
-        }
-        base = mmap((caddr_t) 0, Size,
-                    (flags & VIDMEM_READONLY) ?
-                    PROT_READ : (PROT_READ | PROT_WRITE),
-                    MAP_FLAGS, devMemFd, (off_t) Base + BUS_BASE_BWX);
-        if (base == MAP_FAILED) {
-            FatalError("%s: could not mmap %s [s=%lx,a=%lx] (%s)\n",
-                       "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno));
-        }
-        return base;
-    }
-
-    /* else, mmap /dev/vga */
-    if ((unsigned long) Base < 0xA0000 || (unsigned long) Base >= 0xC0000) {
-        FatalError("%s: Address 0x%lx outside allowable range\n",
-                   "xf86MapVidMem", Base);
-    }
-    base = mmap(0, Size,
-                (flags & VIDMEM_READONLY) ?
-                PROT_READ : (PROT_READ | PROT_WRITE),
-                MAP_FLAGS, xf86Info.consoleFd, (unsigned long) Base + BUS_BASE);
-    if (base == MAP_FAILED) {
-        FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n",
-                   strerror(errno));
-    }
-    return base;
-}
-
-static void
-unmapVidMem(int ScreenNum, void *Base, unsigned long Size)
-{
-    munmap((caddr_t) Base, Size);
-}
-
-/*
- * Read BIOS via mmap()ing DEV_MEM
- */
-
-int
-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-             int Len)
-{
-    unsigned char *ptr;
-    int psize;
-    int mlen;
-
-    checkDevMem(TRUE);
-    if (devMemFd == -1) {
-        return -1;
-    }
-
-    psize = getpagesize();
-    Offset += Base & (psize - 1);
-    Base &= ~(psize - 1);
-    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-    ptr = (unsigned char *) mmap((caddr_t) 0, mlen, PROT_READ,
-                                 MAP_SHARED, devMemFd, (off_t) Base + BUS_BASE);
-    if ((long) ptr == -1) {
-        xf86Msg(X_WARNING,
-                "xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n",
-                DEV_MEM, Len, Base, Offset, strerror(errno));
-        return -1;
-    }
-#ifdef DEBUG
-    xf86MsgVerb(X_INFO, 3,
-                "xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n", Base,
-                ptr[0] | (ptr[1] << 8));
-#endif
-    (void) memcpy(Buf, (void *) (ptr + Offset), Len);
-    (void) munmap((caddr_t) ptr, mlen);
-#ifdef DEBUG
-    xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
-                "-> %02x %02x %02x %02x...\n",
-                Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
-#endif
-    return Len;
-}
-
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 
 extern int ioperm(unsigned long from, unsigned long num, int on);
@@ -422,11 +210,6 @@ xf86DisableIO()
 
 #endif                          /* USE_ALPHA_PIO */
 
-#define vuip    volatile unsigned int *
-
-static void *memSBase = 0;
-static void *memBase = 0;
-
 extern int readDense8(void *Base, register unsigned long Offset);
 extern int readDense16(void *Base, register unsigned long Offset);
 extern int readDense32(void *Base, register unsigned long Offset);
@@ -437,223 +220,6 @@ extern void
 extern void
  writeDense32(int Value, void *Base, register unsigned long Offset);
 
-static int readSparse8(void *Base, register unsigned long Offset);
-static int readSparse16(void *Base, register unsigned long Offset);
-static int readSparse32(void *Base, register unsigned long Offset);
-static void
- writeSparseNB8(int Value, void *Base, register unsigned long Offset);
-static void
- writeSparseNB16(int Value, void *Base, register unsigned long Offset);
-static void
- writeSparseNB32(int Value, void *Base, register unsigned long Offset);
-static void
- writeSparse8(int Value, void *Base, register unsigned long Offset);
-static void
- writeSparse16(int Value, void *Base, register unsigned long Offset);
-static void
- writeSparse32(int Value, void *Base, register unsigned long Offset);
-
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-extern int sysarch(int, void *);
-
-struct parms {
-    u_int64_t hae;
-};
-
-static void
-sethae(u_int64_t hae)
-{
-#ifndef ALPHA_SETHAE
-#define ALPHA_SETHAE 0
-#endif
-    static struct parms p;
-
-    if (p.hae != hae) {
-        p.hae = hae;
-        sysarch(ALPHA_SETHAE, (char *) &p);
-    }
-}
-#endif
-
-static void *
-mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size,
-                int flags)
-{
-    static Bool was_here = FALSE;
-
-    if (!was_here) {
-        was_here = TRUE;
-
-        checkDevMem(FALSE);
-
-        xf86WriteMmio8 = writeSparse8;
-        xf86WriteMmio16 = writeSparse16;
-        xf86WriteMmio32 = writeSparse32;
-        xf86WriteMmioNB8 = writeSparseNB8;
-        xf86WriteMmioNB16 = writeSparseNB16;
-        xf86WriteMmioNB32 = writeSparseNB32;
-        xf86ReadMmio8 = readSparse8;
-        xf86ReadMmio16 = readSparse16;
-        xf86ReadMmio32 = readSparse32;
-
-        memBase = mmap((caddr_t) 0, 0x100000000,
-                       PROT_READ | PROT_WRITE,
-                       MAP_SHARED, devMemFd, (off_t) BUS_BASE);
-        memSBase = mmap((caddr_t) 0, 0x100000000,
-                        PROT_READ | PROT_WRITE,
-                        MAP_SHARED, devMemFd, (off_t) BUS_BASE_BWX);
-
-        if (memSBase == MAP_FAILED || memBase == MAP_FAILED) {
-            FatalError("xf86MapVidMem: Could not mmap framebuffer (%s)\n",
-                       strerror(errno));
-        }
-    }
-    return (void *) ((unsigned long) memBase + Base);
-}
-
-static void
-unmapVidMemSparse(int ScreenNum, void *Base, unsigned long Size)
-{
-}
-
-static int
-readSparse8(void *Base, register unsigned long Offset)
-{
-    register unsigned long result, shift;
-    register unsigned long msb;
-
-    mem_barrier();
-    Offset += (unsigned long) Base - (unsigned long) memBase;
-    shift = (Offset & 0x3) << 3;
-    if (Offset >= (hae_thresh)) {
-        msb = Offset & hae_mask;
-        Offset -= msb;
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-        sethae(msb);
-#endif
-    }
-    result = *(vuip) ((unsigned long) memSBase + (Offset << 5));
-    result >>= shift;
-    return 0xffUL & result;
-}
-
-static int
-readSparse16(void *Base, register unsigned long Offset)
-{
-    register unsigned long result, shift;
-    register unsigned long msb;
-
-    mem_barrier();
-    Offset += (unsigned long) Base - (unsigned long) memBase;
-    shift = (Offset & 0x2) << 3;
-    if (Offset >= (hae_thresh)) {
-        msb = Offset & hae_mask;
-        Offset -= msb;
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-        sethae(msb);
-#endif
-    }
-    result =
-        *(vuip) ((unsigned long) memSBase + (Offset << 5) + (1 << (5 - 2)));
-    result >>= shift;
-    return 0xffffUL & result;
-}
-
-static int
-readSparse32(void *Base, register unsigned long Offset)
-{
-    mem_barrier();
-    return *(vuip) ((unsigned long) Base + (Offset));
-}
-
-static void
-writeSparse8(int Value, void *Base, register unsigned long Offset)
-{
-    register unsigned long msb;
-    register unsigned int b = Value & 0xffU;
-
-    write_mem_barrier();
-    Offset += (unsigned long) Base - (unsigned long) memBase;
-    if (Offset >= (hae_thresh)) {
-        msb = Offset & hae_mask;
-        Offset -= msb;
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-        sethae(msb);
-#endif
-    }
-    *(vuip) ((unsigned long) memSBase + (Offset << 5)) = b * 0x01010101;
-}
-
-static void
-writeSparse16(int Value, void *Base, register unsigned long Offset)
-{
-    register unsigned long msb;
-    register unsigned int w = Value & 0xffffU;
-
-    write_mem_barrier();
-    Offset += (unsigned long) Base - (unsigned long) memBase;
-    if (Offset >= (hae_thresh)) {
-        msb = Offset & hae_mask;
-        Offset -= msb;
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-        sethae(msb);
-#endif
-    }
-    *(vuip) ((unsigned long) memSBase + (Offset << 5) + (1 << (5 - 2))) =
-        w * 0x00010001;
-
-}
-
-static void
-writeSparse32(int Value, void *Base, register unsigned long Offset)
-{
-    write_mem_barrier();
-    *(vuip) ((unsigned long) Base + (Offset)) = Value;
-    return;
-}
-
-static void
-writeSparseNB8(int Value, void *Base, register unsigned long Offset)
-{
-    register unsigned long msb;
-    register unsigned int b = Value & 0xffU;
-
-    Offset += (unsigned long) Base - (unsigned long) memBase;
-    if (Offset >= (hae_thresh)) {
-        msb = Offset & hae_mask;
-        Offset -= msb;
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-        sethae(msb);
-#endif
-    }
-    *(vuip) ((unsigned long) memSBase + (Offset << 5)) = b * 0x01010101;
-}
-
-static void
-writeSparseNB16(int Value, void *Base, register unsigned long Offset)
-{
-    register unsigned long msb;
-    register unsigned int w = Value & 0xffffU;
-
-    Offset += (unsigned long) Base - (unsigned long) memBase;
-    if (Offset >= (hae_thresh)) {
-        msb = Offset & hae_mask;
-        Offset -= msb;
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-        sethae(msb);
-#endif
-    }
-    *(vuip) ((unsigned long) memSBase + (Offset << 5) + (1 << (5 - 2))) =
-        w * 0x00010001;
-}
-
-static void
-writeSparseNB32(int Value, void *Base, register unsigned long Offset)
-{
-    *(vuip) ((unsigned long) Base + (Offset)) = Value;
-    return;
-}
-
 void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset)
     = writeDense8;
 void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset)
diff --git a/xorg-server/hw/xfree86/os-support/bsd/arm_video.c b/xorg-server/hw/xfree86/os-support/bsd/arm_video.c
index e295c9244..3a639b8c6 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/arm_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/arm_video.c
@@ -66,35 +66,6 @@
 #include "xf86_OSlib.h"
 #include "xf86OSpriv.h"
 
-#ifdef __arm32__
-#include "machine/devmap.h"
-struct memAccess {
-    int ioctl;
-    struct map_info memInfo;
-    void *regionVirtBase;
-    Bool Checked;
-    Bool OK;
-};
-
-static void *xf86MapInfoMap();
-static void xf86MapInfoUnmap();
-static struct memAccess *checkMapInfo();
-extern int vgaPhysLinearBase;
-
-/* A memAccess structure is needed for each possible region */
-struct memAccess vgaMemInfo = { CONSOLE_GET_MEM_INFO, NULL, NULL,
-    FALSE, FALSE
-};
-
-struct memAccess linearMemInfo = { CONSOLE_GET_LINEAR_INFO, NULL, NULL,
-    FALSE, FALSE
-};
-
-struct memAccess ioMemInfo = { CONSOLE_GET_IO_INFO, NULL, NULL,
-    FALSE, FALSE
-};
-#endif                          /* __arm32__ */
-
 #if defined(__NetBSD__) && !defined(MAP_FILE)
 #define MAP_FLAGS MAP_SHARED
 #else
@@ -108,12 +79,8 @@ struct memAccess ioMemInfo = { CONSOLE_GET_IO_INFO, NULL, NULL,
 /* Video Memory Mapping section                                            */
 /***************************************************************************/
 
-static Bool useDevMem = FALSE;
 static int devMemFd = -1;
 
-static void *mapVidMem(int, unsigned long, unsigned long, int);
-static void unmapVidMem(int, void *, unsigned long);
-
 /*
  * Check if /dev/mem can be mmap'd.  If it can't print a warning when
  * "warn" is TRUE.
@@ -137,7 +104,6 @@ checkDevMem(Bool warn)
         if (base != MAP_FAILED) {
             munmap((caddr_t) base, 4096);
             devMemFd = fd;
-            useDevMem = TRUE;
             return;
         }
         else {
@@ -146,7 +112,6 @@ checkDevMem(Bool warn)
                 xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
                         DEV_MEM, strerror(errno));
             }
-            useDevMem = FALSE;
             return;
         }
     }
@@ -154,266 +119,17 @@ checkDevMem(Bool warn)
         xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
                 DEV_MEM, strerror(errno));
     }
-    useDevMem = FALSE;
     return;
 }
 
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
-
     checkDevMem(TRUE);
-    pVidMem->linearSupported = useDevMem;
-    pVidMem->mapMem = armMapVidMem;
-    pVidMem->unmapVidMem = armUnmapVidMem;
 
     pVidMem->initialised = TRUE;
 }
 
-static void *
-mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
-{
-    void *base;
-
-    checkDevMem(FALSE);
-
-    if (useDevMem) {
-        if (devMemFd < 0) {
-            FatalError("xf86MapVidMem: failed to open %s (%s)\n",
-                       DEV_MEM, strerror(errno));
-        }
-        base = mmap((caddr_t) 0, Size,
-                    (flags & VIDMEM_READONLY) ?
-                    PROT_READ : (PROT_READ | PROT_WRITE),
-                    MAP_FLAGS, devMemFd, (off_t) Base + BUS_BASE_BWX);
-        if (base == MAP_FAILED) {
-            FatalError("%s: could not mmap %s [s=%x,a=%x] (%s)\n",
-                       "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno));
-        }
-        return base;
-    }
-
-    /* else, mmap /dev/vga */
-    if ((unsigned long) Base < 0xA0000 || (unsigned long) Base >= 0xC0000) {
-        FatalError("%s: Address 0x%x outside allowable range\n",
-                   "xf86MapVidMem", Base);
-    }
-    base = mmap(0, Size,
-                (flags & VIDMEM_READONLY) ?
-                PROT_READ : (PROT_READ | PROT_WRITE),
-                MAP_FLAGS, xf86Info.consoleFd, (unsigned long) Base - 0xA0000);
-    if (base == MAP_FAILED) {
-        FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n",
-                   strerror(errno));
-    }
-    return base;
-}
-
-static void
-unmapVidMem(int ScreenNum, void *Base, unsigned long Size)
-{
-    munmap((caddr_t) Base, Size);
-}
-
-/*
- * Read BIOS via mmap()ing DEV_MEM
- */
-
-int
-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-             int Len)
-{
-    unsigned char *ptr;
-    int psize;
-    int mlen;
-
-    checkDevMem(TRUE);
-    if (devMemFd == -1) {
-        return -1;
-    }
-
-    psize = getpagesize();
-    Offset += Base & (psize - 1);
-    Base &= ~(psize - 1);
-    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-    ptr = (unsigned char *) mmap((caddr_t) 0, mlen, PROT_READ,
-                                 MAP_SHARED, devMemFd, (off_t) Base + BUS_BASE);
-    if ((long) ptr == -1) {
-        xf86Msg(X_WARNING,
-                "xf86ReadBIOS: %s mmap[s=%x,a=%x,o=%x] failed (%s)\n",
-                DEV_MEM, Len, Base, Offset, strerror(errno));
-        return -1;
-    }
-#ifdef DEBUG
-    ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
-           Base, ptr[0] | (ptr[1] << 8));
-#endif
-    (void) memcpy(Buf, (void *) (ptr + Offset), Len);
-    (void) munmap((caddr_t) ptr, mlen);
-#ifdef DEBUG
-    xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
-                "-> %02x %02x %02x %02x...\n",
-                Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
-#endif
-    return Len;
-}
-
-/* XXX This needs to be updated for the ND */
-
-/*
-** Find out whether the console driver provides memory mapping information 
-** for the specified region and return the map_info pointer. Print a warning if required.
-*/
-static struct memAccess *
-checkMapInfo(Bool warn, int Region)
-{
-    struct memAccess *memAccP;
-
-    switch (Region) {
-    case VGA_REGION:
-        memAccP = &vgaMemInfo;
-        break;
-
-    case LINEAR_REGION:
-        memAccP = &linearMemInfo;
-        break;
-
-    case MMIO_REGION:
-        memAccP = &ioMemInfo;
-        break;
-
-    default:
-        return NULL;
-        break;
-    }
-
-    if (!memAccP->Checked) {
-        if (ioctl(xf86Info.consoleFd, memAccP->ioctl, &(memAccP->memInfo)) ==
-            -1) {
-            if (warn) {
-                xf86Msg(X_WARNING,
-                        "checkMapInfo: failed to get map info for region %d\n\t(%s)\n",
-                        Region, strerror(errno));
-            }
-        }
-        else {
-            if (memAccP->memInfo.u.map_info_mmap.map_offset != MAP_INFO_UNKNOWN)
-                memAccP->OK = TRUE;
-        }
-        memAccP->Checked = TRUE;
-    }
-    if (memAccP->OK) {
-        return memAccP;
-    }
-    else {
-        return NULL;
-    }
-}
-
-static void *
-xf86MapInfoMap(struct memAccess *memInfoP, void *Base, unsigned long Size)
-{
-    struct map_info *mapInfoP = &(memInfoP->memInfo);
-
-    if (mapInfoP->u.map_info_mmap.map_size == MAP_INFO_UNKNOWN) {
-        Size = (unsigned long) Base + Size;
-    }
-    else {
-        Size = mapInfoP->u.map_info_mmap.map_size;
-    }
-
-    switch (mapInfoP->method) {
-    case MAP_MMAP:
-        /* Need to remap if size is unknown because we may not have
-           mapped the whole region initially */
-        if (memInfoP->regionVirtBase == NULL ||
-            mapInfoP->u.map_info_mmap.map_size == MAP_INFO_UNKNOWN) {
-            if ((memInfoP->regionVirtBase =
-                 mmap((caddr_t) 0,
-                      Size,
-                      PROT_READ | PROT_WRITE,
-                      MAP_SHARED,
-                      xf86Info.consoleFd,
-                      (unsigned long) mapInfoP->u.map_info_mmap.map_offset))
-                == (void *) -1) {
-                FatalError
-                    ("xf86MapInfoMap: Failed to map memory at 0x%x\n\t%s\n",
-                     mapInfoP->u.map_info_mmap.map_offset, strerror(errno));
-            }
-            if (mapInfoP->u.map_info_mmap.internal_offset > 0)
-                memInfoP->regionVirtBase +=
-                    mapInfoP->u.map_info_mmap.internal_offset;
-        }
-        break;
-
-    default:
-        FatalError("xf86MapInfoMap: Unsuported mapping method\n");
-        break;
-    }
-
-    return (void *) ((int) memInfoP->regionVirtBase + (int) Base);
-}
-
-static void
-xf86MapInfoUnmap(struct memAccess *memInfoP, unsigned long Size)
-{
-    struct map_info *mapInfoP = &(memInfoP->memInfo);
-
-    switch (mapInfoP->method) {
-    case MAP_MMAP:
-        if (memInfoP->regionVirtBase != NULL) {
-            if (mapInfoP->u.map_info_mmap.map_size != MAP_INFO_UNKNOWN)
-                Size = mapInfoP->u.map_info_mmap.map_size;
-            munmap((caddr_t) memInfoP->regionVirtBase, Size);
-            memInfoP->regionVirtBase = NULL;
-        }
-        break;
-    default:
-        FatalError("xf86MapInfoMap: Unsuported mapping method\n");
-        break;
-    }
-}
-
-static void *
-armMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
-{
-    struct memAccess *memInfoP;
-
-    if ((memInfoP = checkMapInfo(FALSE, Region)) != NULL) {
-        /*
-         ** xf86 passes in a physical address offset from the start
-         ** of physical memory, but xf86MapInfoMap expects an 
-         ** offset from the start of the specified region - it gets 
-         ** the physical address of the region from the display driver.
-         */
-        switch (Region) {
-        case LINEAR_REGION:
-            if (vgaPhysLinearBase) {
-                Base -= vgaPhysLinearBase;
-            }
-            break;
-        case VGA_REGION:
-            Base -= 0xA0000;
-            break;
-        }
-
-        base = xf86MapInfoMap(memInfoP, Base, Size);
-        return base;
-    }
-    return mapVidMem(ScreenNum, Base, Size, flags);
-}
-
-static void
-armUnmapVidMem(int ScreenNum, void *Base, unsigned long Size)
-{
-    struct memAccess *memInfoP;
-
-    if ((memInfoP = checkMapInfo(FALSE, Region)) != NULL) {
-        xf86MapInfoUnmap(memInfoP, Base, Size);
-    }
-    unmapVidMem(ScreenNum, Base, Size);
-}
-
 #ifdef USE_DEV_IO
 static int IoFd = -1;
 
diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_axp.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_axp.c
deleted file mode 100644
index e7a36f8bf..000000000
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_axp.c
+++ /dev/null
@@ -1,71 +0,0 @@
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-#include "os.h"
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "shared/xf86Axp.h"
-#include <sys/param.h>
-#include "xf86_OSlib.h"
-#include <stdio.h>
-#include <sys/sysctl.h>
-
-axpDevice bsdGetAXP(void);
-
-/*
- * BSD does a very nice job providing system information to
- * user space programs. Unfortunately it doesn't provide all
- * the information required. Therefore we just obtain the
- * system type and look up the rest from a list we maintain
- * ourselves.
- */
-
-typedef struct {
-    char *name;
-    int type;
-} _AXP;
-
-static _AXP axpList[] = {
-    {"apecs", APECS},
-    {"pyxis", PYXIS},
-    {"cia", CIA},
-    {"irongate", IRONGATE},
-    {"lca", LCA},
-    {"t2", T2},
-    {"tsunami", TSUNAMI},
-    {NULL, SYS_NONE}
-};
-
-axpDevice
-bsdGetAXP(void)
-{
-    int i;
-    char sysname[64];
-    size_t len = sizeof(sysname);
-
-#ifdef __OpenBSD__
-    int mib[3];
-    int error;
-
-    mib[0] = CTL_MACHDEP;
-    mib[1] = CPU_CHIPSET;
-    mib[2] = CPU_CHIPSET_TYPE;
-
-    if ((error = sysctl(mib, 3, &sysname, &len, NULL, 0)) < 0)
-#else
-    if ((sysctlbyname("hw.chipset.type", &sysname, &len, 0, 0)) < 0)
-#endif
-        FatalError("bsdGetAXP: can't find machine type\n");
-#ifdef DEBUG
-    xf86Msg(X_INFO, "AXP is a: %s\n", sysname);
-#endif
-    for (i = 0;; i++) {
-        if (axpList[i].name == NULL)
-            return SYS_NONE;
-        if (!strcmp(sysname, axpList[i].name))
-            return axpList[i].type;
-    }
-}
diff --git a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
index 745319054..6c3bbcb48 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
@@ -34,27 +34,6 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-#ifdef HAS_MTRR_SUPPORT
-#ifndef __NetBSD__
-#include <sys/types.h>
-#include <sys/memrange.h>
-#else
-#include "memrange.h"
-#endif
-#define X_MTRR_ID "XFree86"
-#endif
-
-#if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
-#include <machine/mtrr.h>
-#include <machine/sysarch.h>
-#include <sys/queue.h>
-#ifdef __x86_64__
-#define i386_set_mtrr x86_64_set_mtrr
-#define i386_get_mtrr x86_64_get_mtrr
-#define i386_iopl x86_64_iopl
-#endif
-#endif
-
 #include "xf86_OSlib.h"
 #include "xf86OSpriv.h"
 
@@ -85,20 +64,6 @@ static int devMemFd = -1;
 #define DEV_APERTURE "/dev/xf86"
 #endif
 
-static void *mapVidMem(int, unsigned long, unsigned long, int);
-static void unmapVidMem(int, void *, unsigned long);
-
-#ifdef HAS_MTRR_SUPPORT
-static void *setWC(int, unsigned long, unsigned long, Bool, MessageType);
-static void undoWC(int, void *);
-static Bool cleanMTRR(void);
-#endif
-#if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
-static void *NetBSDsetWC(int, unsigned long, unsigned long, Bool,
-                           MessageType);
-static void NetBSDundoWC(int, void *);
-#endif
-
 /*
  * Check if /dev/mem can be mmap'd.  If it can't print a warning when
  * "warn" is TRUE.
@@ -188,119 +153,10 @@ void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
     checkDevMem(TRUE);
-    pVidMem->linearSupported = useDevMem;
-    pVidMem->mapMem = mapVidMem;
-    pVidMem->unmapMem = unmapVidMem;
-
-    if (useDevMem)
-        pci_system_init_dev_mem(devMemFd);
-
-#ifdef HAS_MTRR_SUPPORT
-    if (useDevMem) {
-        if (cleanMTRR()) {
-            pVidMem->setWC = setWC;
-            pVidMem->undoWC = undoWC;
-        }
-    }
-#endif
-#if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
-    pVidMem->setWC = NetBSDsetWC;
-    pVidMem->undoWC = NetBSDundoWC;
-#endif
-    pVidMem->initialised = TRUE;
-}
 
-static void *
-mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
-{
-    void *base;
+    pci_system_init_dev_mem(devMemFd);
 
-    checkDevMem(FALSE);
-
-    if (useDevMem) {
-        if (devMemFd < 0) {
-            FatalError("xf86MapVidMem: failed to open %s (%s)",
-                       DEV_MEM, strerror(errno));
-        }
-        base = mmap((caddr_t) 0, Size,
-                    (flags & VIDMEM_READONLY) ?
-                    PROT_READ : (PROT_READ | PROT_WRITE),
-                    MAP_FLAGS, devMemFd, (off_t) Base);
-        if (base == MAP_FAILED) {
-            FatalError("%s: could not mmap %s [s=%lx,a=%lx] (%s)",
-                       "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno));
-        }
-        return base;
-    }
-
-    /* else, mmap /dev/vga */
-    if ((unsigned long) Base < 0xA0000 || (unsigned long) Base >= 0xC0000) {
-        FatalError("%s: Address 0x%lx outside allowable range",
-                   "xf86MapVidMem", Base);
-    }
-    base = mmap(0, Size,
-                (flags & VIDMEM_READONLY) ?
-                PROT_READ : (PROT_READ | PROT_WRITE),
-                MAP_FLAGS, xf86Info.consoleFd, (unsigned long) Base - 0xA0000);
-    if (base == MAP_FAILED) {
-        FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)",
-                   strerror(errno));
-    }
-    return base;
-}
-
-static void
-unmapVidMem(int ScreenNum, void *Base, unsigned long Size)
-{
-    munmap((caddr_t) Base, Size);
-}
-
-/*
- * Read BIOS via mmap()ing DEV_MEM
- */
-
-int
-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-             int Len)
-{
-    unsigned char *ptr;
-    int psize;
-    int mlen;
-
-    checkDevMem(TRUE);
-    if (devMemFd == -1) {
-        return -1;
-    }
-
-    psize = getpagesize();
-    Offset += Base & (psize - 1);
-    Base &= ~(psize - 1);
-    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-    ptr = (unsigned char *) mmap((caddr_t) 0, mlen, PROT_READ,
-                                 MAP_SHARED, devMemFd, (off_t) Base);
-    if ((long) ptr == -1) {
-        xf86Msg(X_WARNING,
-                "xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n",
-                DEV_MEM, Len, Base, Offset, strerror(errno));
-#ifdef __OpenBSD__
-        if (Base < 0xa0000) {
-            xf86Msg(X_WARNING, SYSCTL_MSG2);
-        }
-#endif
-        return -1;
-    }
-#ifdef DEBUG
-    ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
-           Base, ptr[0] | (ptr[1] << 8));
-#endif
-    (void) memcpy(Buf, (void *) (ptr + Offset), Len);
-    (void) munmap((caddr_t) ptr, mlen);
-#ifdef DEBUG
-    xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
-                "-> %02x %02x %02x %02x...\n",
-                Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
-#endif
-    return Len;
+    pVidMem->initialised = TRUE;
 }
 
 #ifdef USE_I386_IOPL
@@ -470,417 +326,3 @@ xf86SetRGBOut()
     return;
 }
 #endif
-
-#ifdef HAS_MTRR_SUPPORT
-/* memory range (MTRR) support for FreeBSD */
-
-/*
- * This code is experimental.  Some parts may be overkill, and other parts
- * may be incomplete.
- */
-
-/*
- * getAllRanges returns the full list of memory ranges with attributes set.
- */
-
-static struct mem_range_desc *
-getAllRanges(int *nmr)
-{
-    struct mem_range_desc *mrd;
-    struct mem_range_op mro;
-
-    /*
-     * Find how many ranges there are.  If this fails, then the kernel
-     * probably doesn't have MTRR support.
-     */
-    mro.mo_arg[0] = 0;
-    if (ioctl(devMemFd, MEMRANGE_GET, &mro))
-        return NULL;
-    *nmr = mro.mo_arg[0];
-    mrd = xnfalloc(*nmr * sizeof(struct mem_range_desc));
-    mro.mo_arg[0] = *nmr;
-    mro.mo_desc = mrd;
-    if (ioctl(devMemFd, MEMRANGE_GET, &mro)) {
-        free(mrd);
-        return NULL;
-    }
-    return mrd;
-}
-
-/*
- * cleanMTRR removes any memory attribute that may be left by a previous
- * X server.  Normally there won't be any, but this takes care of the
- * case where a server crashed without being able finish cleaning up.
- */
-
-static Bool
-cleanMTRR()
-{
-    struct mem_range_desc *mrd;
-    struct mem_range_op mro;
-    int nmr, i;
-
-    /* This shouldn't happen */
-    if (devMemFd < 0)
-        return FALSE;
-
-    if (!(mrd = getAllRanges(&nmr)))
-        return FALSE;
-
-    for (i = 0; i < nmr; i++) {
-        if (strcmp(mrd[i].mr_owner, X_MTRR_ID) == 0 &&
-            (mrd[i].mr_flags & MDF_ACTIVE)) {
-#ifdef DEBUG
-            ErrorF("Clean for (0x%lx,0x%lx)\n",
-                   (unsigned long) mrd[i].mr_base,
-                   (unsigned long) mrd[i].mr_len);
-#endif
-            if (mrd[i].mr_flags & MDF_FIXACTIVE) {
-                mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-                mrd[i].mr_flags = MDF_UNCACHEABLE;
-            }
-            else {
-                mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
-            }
-            mro.mo_desc = mrd + i;
-            ioctl(devMemFd, MEMRANGE_SET, &mro);
-        }
-    }
-#ifdef DEBUG
-    sleep(10);
-#endif
-    free(mrd);
-    return TRUE;
-}
-
-typedef struct x_RangeRec {
-    struct mem_range_desc mrd;
-    Bool wasWC;
-    struct x_RangeRec *next;
-} RangeRec, *RangePtr;
-
-static void
-freeRangeList(RangePtr range)
-{
-    RangePtr rp;
-
-    while (range) {
-        rp = range;
-        range = rp->next;
-        free(rp);
-    }
-}
-
-static RangePtr
-dupRangeList(RangePtr list)
-{
-    RangePtr new = NULL, rp, p;
-
-    rp = list;
-    while (rp) {
-        p = xnfalloc(sizeof(RangeRec));
-        *p = *rp;
-        p->next = new;
-        new = p;
-        rp = rp->next;
-    }
-    return new;
-}
-
-static RangePtr
-sortRangeList(RangePtr list)
-{
-    RangePtr rp1, rp2, copy, sorted = NULL, minp, prev, minprev;
-    unsigned long minBase;
-
-    /* Sort by base address */
-    rp1 = copy = dupRangeList(list);
-    while (rp1) {
-        minBase = rp1->mrd.mr_base;
-        minp = rp1;
-        minprev = NULL;
-        prev = rp1;
-        rp2 = rp1->next;
-        while (rp2) {
-            if (rp2->mrd.mr_base < minBase) {
-                minBase = rp2->mrd.mr_base;
-                minp = rp2;
-                minprev = prev;
-            }
-            prev = rp2;
-            rp2 = rp2->next;
-        }
-        if (minprev) {
-            minprev->next = minp->next;
-            rp1 = copy;
-        }
-        else {
-            rp1 = minp->next;
-        }
-        minp->next = sorted;
-        sorted = minp;
-    }
-    return sorted;
-}
-
-/*
- * findRanges returns a list of ranges that overlap the specified range.
- */
-
-static void
-findRanges(unsigned long base, unsigned long size, RangePtr * ucp,
-           RangePtr * wcp)
-{
-    struct mem_range_desc *mrd;
-    int nmr, i;
-    RangePtr rp, *p;
-
-    if (!(mrd = getAllRanges(&nmr)))
-        return;
-
-    for (i = 0; i < nmr; i++) {
-        if ((mrd[i].mr_flags & MDF_ACTIVE) &&
-            mrd[i].mr_base < base + size &&
-            mrd[i].mr_base + mrd[i].mr_len > base) {
-            if (mrd[i].mr_flags & MDF_WRITECOMBINE)
-                p = wcp;
-            else if (mrd[i].mr_flags & MDF_UNCACHEABLE)
-                p = ucp;
-            else
-                continue;
-            rp = xnfalloc(sizeof(RangeRec));
-            rp->mrd = mrd[i];
-            rp->next = *p;
-            *p = rp;
-        }
-    }
-    free(mrd);
-}
-
-/*
- * This checks if the existing overlapping ranges fully cover the requested
- * range.  Is this overkill?
- */
-
-static Bool
-fullCoverage(unsigned long base, unsigned long size, RangePtr overlap)
-{
-    RangePtr rp1, sorted = NULL;
-    unsigned long end;
-
-    sorted = sortRangeList(overlap);
-    /* Look for gaps */
-    rp1 = sorted;
-    end = base + size;
-    while (rp1) {
-        if (rp1->mrd.mr_base > base) {
-            freeRangeList(sorted);
-            return FALSE;
-        }
-        else {
-            base = rp1->mrd.mr_base + rp1->mrd.mr_len;
-        }
-        if (base >= end) {
-            freeRangeList(sorted);
-            return TRUE;
-        }
-        rp1 = rp1->next;
-    }
-    freeRangeList(sorted);
-    return FALSE;
-}
-
-static void *
-addWC(int screenNum, unsigned long base, unsigned long size, MessageType from)
-{
-    RangePtr uc = NULL, wc = NULL, retlist = NULL;
-    struct mem_range_desc mrd;
-    struct mem_range_op mro;
-
-    findRanges(base, size, &uc, &wc);
-
-    /* See of the full range is already WC */
-    if (!uc && fullCoverage(base, size, wc)) {
-        xf86DrvMsg(screenNum, from,
-                   "Write-combining range (0x%lx,0x%lx) was already set\n",
-                   base, size);
-        return NULL;
-    }
-
-    /* Otherwise, try to add the new range */
-    mrd.mr_base = base;
-    mrd.mr_len = size;
-    strcpy(mrd.mr_owner, X_MTRR_ID);
-    mrd.mr_flags = MDF_WRITECOMBINE;
-    mro.mo_desc = &mrd;
-    mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-    if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-        xf86DrvMsg(screenNum, X_WARNING,
-                   "Failed to set write-combining range "
-                   "(0x%lx,0x%lx)\n", base, size);
-        return NULL;
-    }
-    else {
-        xf86DrvMsg(screenNum, from,
-                   "Write-combining range (0x%lx,0x%lx)\n", base, size);
-        retlist = xnfalloc(sizeof(RangeRec));
-        retlist->mrd = mrd;
-        retlist->wasWC = FALSE;
-        retlist->next = NULL;
-        return retlist;
-    }
-}
-
-static void *
-delWC(int screenNum, unsigned long base, unsigned long size, MessageType from)
-{
-    RangePtr uc = NULL, wc = NULL, retlist = NULL;
-    struct mem_range_desc mrd;
-    struct mem_range_op mro;
-
-    findRanges(base, size, &uc, &wc);
-
-    /*
-     * See of the full range is already not WC, or if there is full
-     * coverage from UC ranges.
-     */
-    if (!wc || fullCoverage(base, size, uc)) {
-        xf86DrvMsg(screenNum, from,
-                   "Write-combining range (0x%lx,0x%lx) was already clear\n",
-                   base, size);
-        return NULL;
-    }
-
-    /* Otherwise, try to add the new range */
-    mrd.mr_base = base;
-    mrd.mr_len = size;
-    strcpy(mrd.mr_owner, X_MTRR_ID);
-    mrd.mr_flags = MDF_UNCACHEABLE;
-    mro.mo_desc = &mrd;
-    mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-    if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-        xf86DrvMsg(screenNum, X_WARNING,
-                   "Failed to remove write-combining range "
-                   "(0x%lx,0x%lx)\n", base, size);
-        /* XXX Should then remove all of the overlapping WC ranges */
-        return NULL;
-    }
-    else {
-        xf86DrvMsg(screenNum, from,
-                   "Removed Write-combining range (0x%lx,0x%lx)\n", base, size);
-        retlist = xnfalloc(sizeof(RangeRec));
-        retlist->mrd = mrd;
-        retlist->wasWC = TRUE;
-        retlist->next = NULL;
-        return retlist;
-    }
-}
-
-static void *
-setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
-      MessageType from)
-{
-    if (enable)
-        return addWC(screenNum, base, size, from);
-    else
-        return delWC(screenNum, base, size, from);
-}
-
-static void
-undoWC(int screenNum, void *list)
-{
-    RangePtr rp;
-    struct mem_range_op mro;
-    Bool failed;
-
-    rp = list;
-    while (rp) {
-#ifdef DEBUG
-        ErrorF("Undo for (0x%lx,0x%lx), %d\n",
-               (unsigned long) rp->mrd.mr_base,
-               (unsigned long) rp->mrd.mr_len, rp->wasWC);
-#endif
-        failed = FALSE;
-        if (rp->wasWC) {
-            mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-            rp->mrd.mr_flags = MDF_WRITECOMBINE;
-            strcpy(rp->mrd.mr_owner, "unknown");
-        }
-        else {
-            mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
-        }
-        mro.mo_desc = &rp->mrd;
-
-        if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-            if (!rp->wasWC) {
-                mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-                rp->mrd.mr_flags = MDF_UNCACHEABLE;
-                strcpy(rp->mrd.mr_owner, "unknown");
-                if (ioctl(devMemFd, MEMRANGE_SET, &mro))
-                    failed = TRUE;
-            }
-            else
-                failed = TRUE;
-        }
-        if (failed) {
-            xf86DrvMsg(screenNum, X_WARNING,
-                       "Failed to restore MTRR range (0x%lx,0x%lx)\n",
-                       (unsigned long) rp->mrd.mr_base,
-                       (unsigned long) rp->mrd.mr_len);
-        }
-        rp = rp->next;
-    }
-}
-
-#endif                          /* HAS_MTRR_SUPPORT */
-
-#if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
-static void *
-NetBSDsetWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
-            MessageType from)
-{
-    struct mtrr *mtrrp;
-    int n;
-
-    xf86DrvMsg(screenNum, X_WARNING,
-               "%s MTRR %lx - %lx\n", enable ? "set" : "remove",
-               base, (base + size));
-
-    mtrrp = xnfalloc(sizeof(struct mtrr));
-    mtrrp->base = base;
-    mtrrp->len = size;
-    mtrrp->type = MTRR_TYPE_WC;
-
-    /*
-     * MTRR_PRIVATE will make this MTRR get reset automatically
-     * if this process exits, so we have no need for an explicit
-     * cleanup operation when starting a new server.
-     */
-
-    if (enable)
-        mtrrp->flags = MTRR_VALID | MTRR_PRIVATE;
-    else
-        mtrrp->flags = 0;
-    n = 1;
-
-    if (i386_set_mtrr(mtrrp, &n) < 0) {
-        free(mtrrp);
-        return NULL;
-    }
-    return mtrrp;
-}
-
-static void
-NetBSDundoWC(int screenNum, void *list)
-{
-    struct mtrr *mtrrp = (struct mtrr *) list;
-    int n;
-
-    if (mtrrp == NULL)
-        return;
-    n = 1;
-    mtrrp->flags &= ~MTRR_VALID;
-    i386_set_mtrr(mtrrp, &n);
-    free(mtrrp);
-}
-#endif
diff --git a/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c b/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c
index 3fd28c3b5..b1cf7eb1b 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c
@@ -44,74 +44,18 @@
 #define DEV_MEM "/dev/xf86"
 #endif
 
-static void *ppcMapVidMem(int, unsigned long, unsigned long, int flags);
-static void ppcUnmapVidMem(int, void *, unsigned long);
-
 Bool xf86EnableIO(void);
 void xf86DisableIO(void);
 
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
-    pVidMem->linearSupported = TRUE;
-    pVidMem->mapMem = ppcMapVidMem;
-    pVidMem->unmapMem = ppcUnmapVidMem;
     pVidMem->initialised = TRUE;
     xf86EnableIO();
 }
 
 volatile unsigned char *ioBase = MAP_FAILED;
 
-static void *
-ppcMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
-{
-    int fd = xf86Info.consoleFd;
-    void *base;
-
-#ifdef DEBUG
-    xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", Base, Size, fd);
-#endif
-
-    base = mmap(0, Size,
-                (flags & VIDMEM_READONLY) ?
-                PROT_READ : (PROT_READ | PROT_WRITE), MAP_SHARED, fd, Base);
-    if (base == MAP_FAILED)
-        FatalError("%s: could not mmap screen [s=%lx,a=%lx] (%s)",
-                   "xf86MapVidMem", Size, Base, strerror(errno));
-
-    return base;
-}
-
-static void
-ppcUnmapVidMem(int ScreenNum, void *Base, unsigned long Size)
-{
-    munmap(Base, Size);
-}
-
-int
-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-             int Len)
-{
-    int rv;
-    static int kmem = -1;
-
-    if (kmem == -1) {
-        kmem = open(DEV_MEM, 2);
-        if (kmem == -1) {
-            FatalError("xf86ReadBIOS: open %s", DEV_MEM);
-        }
-    }
-
-#ifdef DEBUG
-    xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n", Base, Offset, Len);
-#endif
-
-    lseek(kmem, Base + Offset, 0);
-    rv = read(kmem, Buf, Len);
-
-    return rv;
-}
-
 Bool
 xf86EnableIO()
 {
diff --git a/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c b/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c
index 02951d602..5bed01790 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c
@@ -38,48 +38,8 @@
 /* Video Memory Mapping section                                            */
 /***************************************************************************/
 
-static void *sparc64MapVidMem(int, unsigned long, unsigned long, int);
-static void sparc64UnmapVidMem(int, void *, unsigned long);
-
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
-    pVidMem->linearSupported = TRUE;
-    pVidMem->mapMem = sparc64MapVidMem;
-    pVidMem->unmapMem = sparc64UnmapVidMem;
     pVidMem->initialised = TRUE;
 }
-
-static void *
-sparc64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size,
-                 int flags)
-{
-    int fd = xf86Info.consoleFd;
-    void *base;
-
-#ifdef DEBUG
-    xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", Base, Size, fd);
-#endif
-
-    base = mmap(0, Size,
-                (flags & VIDMEM_READONLY) ?
-                PROT_READ : (PROT_READ | PROT_WRITE), MAP_SHARED, fd, Base);
-    if (base == MAP_FAILED)
-        FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)",
-                   "xf86MapVidMem", Size, Base, strerror(errno));
-    return base;
-}
-
-static void
-sparc64UnmapVidMem(int ScreenNum, void *Base, unsigned long Size)
-{
-    munmap(Base, Size);
-}
-
-int
-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-             int Len)
-{
-
-    return 0;
-}